Committing current changes
Merge branch 'master' of https://github.com/chrisbubernak/TankWars

Conflicts:
	index.html