Conflicts:
.DS_Store
css/.DS_Store
forum.html
index.html
js/libs/jquery-1.6.2.min.js
js/libs/modernizr-2.0.6.min.js
Merge branch 'master' of https://github.com/GavinArrell/indieDex

Conflicts:
	.DS_Store
	.gitignore
	css/.DS_Store
	forum.html