change fps to 30
Merge branch 'master' of https://github.com/TheTwentySecondGroup/game.git
test
Merge branch 'master' of https://github.com/TheTwentySecondGroup/game
fix attack2 and attack7