fixes
Merge branch 'master' of github.com:airmanopus/MHacksFall2014

Conflicts:
	index.html
Speed adde3d