Remove a bit of Git merge markup.37/head
treeee63716c421a02dce17cc06134705d0b64b8407c
-rw-r--r-- 32 .gitignore
-rw-r--r-- 15090 GPL-license.txt
-rw-r--r-- 1095 MIT-license.txt
-rw-r--r-- 3942 README.md
drwxr-xr-x - core
drwxr-xr-x - css
drwxr-xr-x - docs
drwxr-xr-x - extensions
drwxr-xr-x - fonts
-rw-r--r-- 260 home.js
-rw-r--r-- 5492 index.html
drwxr-xr-x - introduction
-rw-r--r-- 91669 jquery-1.6.4.min.js
-rw-r--r-- 13963 modernizr.custom.js
drwxr-xr-x - test
drwxr-xr-x - themes