Content, smaller floors, lighting set
Merge branch 'Project-folder' of https://github.com/Pingli/PjBackToBasics into Project-folder

Conflicts:
	YUME/Game2.cpp
	YUME/Level/Loader/TileLoader.cpp
Fixed GIT Conflicts

It's not fun when two people "work" on the same class