Commit issue
..
Merge
Merge branch 'master' of https://github.com/CodeThat/TankGame

Conflicts:
	TankGame/TankGame.sdf
	TankGame/TankGame.v12.suo
	TankGame/TankGame/Debug/TankGame.log
	TankGame/TankGame/Debug/vc120.idb
	TankGame/TankGame/Debug/vc120.pdb