H2
Merge branch 'master' of https://github.com/dennymcentire/Robot-Math-Game

Conflicts:
	bootstrap/index.html