FIXED SHIT
Merge branch 'master' of https://github.com/QuantumFractal/HackISU-HackulusRift

Conflicts:
	src/tablet/index.html