Game and using InGameState
Game and InGameState
Merge branch 'master' of https://github.com/jeyoder/kingdom.git

Conflicts:
	Kingdom/src/main.cpp