test
Merge branch 'master' of https://github.com/TheTwentySecondGroup/game
fix map
fix light
add attack effect
fix system
fix draw
fix effect
add picture
add effect
fix attack effect
fix title
Merge branch 'master' of
https://github.com/TheTwentySecondGroup/game.git

Conflicts:
	source/main.cpp
	source/system.cpp
	testprogram
fix marge miss
fix marge miss