Finished up game logic and some other things
Merge branch 'master' of github.com:shanemarks/EvilOverlord