Platformer
Merge branch 'master' of https://github.com/Ludusamo/SFML-CodeBase

Conflicts:
	Platformer/Platformer.depend
	Platformer/Platformer.layout
	Platformer/bin/Debug/Platformer
	Platformer/include/TileData.h
	Platformer/res/lvls/testpng.png
	Platformer/src/Level.cpp
	Platformer/src/TileData.cpp
Bug Fix