add attack effect
fix draw effect
add bmp file
add attack effect
add texture image
add file
marge
Merge branch 'master' of
https://github.com/TheTwentySecondGroup/game.git

Conflicts:
	testprogram
Merge remote-tracking branch 'origin/master' into chihiro_testing