Merge pull request #232 from ping19/master

Reset weapon on new game
Merge pull request #233 from ping19/master

Gap time between each shots