i don't even know what I have done
Merge branch 'master' of https://github.com/Maistho/Game-of-Generals.git
Merge branch 'master' of https://github.com/Maistho/Game-of-Generals.git