add texture
fix effect
add drawAttack7
add texture sword.bmp
fix attack effect
Merge remote-tracking branch 'origin/master' into chihiro_testing

Conflicts:
	testprogram