Text stuff
turn text
Merge branch 'master' of https://github.com/jeyoder/kingdom.git

Conflicts:
	Kingdom/src/InGameState.cpp
	Kingdom/src/InGameState.h
	Kingdom/src/TileMap.cpp
	Kingdom/src/main.cpp
tried to give you text
Merge branch 'master' of https://github.com/jeyoder/kingdom.git

Conflicts:
	Kingdom/src/InGameState.cpp