mid stage for implementing pieces
Merge branch 'master' of https://github.com/jeyoder/kingdom.git

Conflicts:
	Kingdom/src/FileMapGenerator.cpp
	Kingdom/src/TileMap.cpp
	Kingdom/src/TileMap.h
	Kingdom/src/main.cpp
 yes