changed index again
Merge branch 'master' of https://github.com/spensimon/indiemundo

Conflicts:
	index.html
test