Merge branch 'master' of https://github.com/Elyotna/IntWars into master