test
Merge branch 'master' of https://github.com/TheTwentySecondGroup/game
fix attack2 and attack7
Merge remote-tracking branch 'origin/chihiro_testing'

Conflicts:
	testprogram