battle state for merging
Merge branch 'master' of https://github.com/Spyb0y/The-Game-that-Shall....you-get-the-idea