Fixed some indentation.
It does stuff!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Merge branch 'master' of github.com:immibis/SOTHackfest2014

Conflicts:
	static/index.html