some changes
Merge branch 'master' of https://github.com/immibis/SOTHackfest2014
Merge branch 'master' of https://github.com/immibis/SOTHackfest2014
Merge branch 'master' of https://github.com/immibis/SOTHackfest2014
Merge branch 'master' of https://github.com/immibis/SOTHackfest2014

Conflicts:
	static/index.html