Fix CImg warning. Added simple classes for level generation
Merge branch 'master' of https://github.com/Theundeadwarrior/LudumDare29

Conflicts:
	project/GameEngine/GameEngine.vcxproj
	project/SceneManager/SceneManager.vcxproj.filters
Merge branch 'master' of https://github.com/Theundeadwarrior/LudumDare29

Conflicts:
	project/SceneManager/SceneManager.vcxproj.filters