changes gitignore
Merge branch 'master' of https://github.com/xuejingdong/TankGame

Conflicts:
	.gitignore