Merge branch 'master' of https://github.com/anikan/CalHacks

Conflicts:
	index.html
LeTypo