si!

si!
Merge branch 'master' of https://github.com/kravening/tankgame-MG1C

Conflicts:
	bin/index.html
	src/Main.as