temp
Merge branch 'master' of https://github.com/Theundeadwarrior/LudumDare29

Conflicts:
	source/SceneManager/Scene/GameplayScenes/PlaceholderLevel.cpp
fix levels and gravity
Merge branch 'master' of https://github.com/Theundeadwarrior/LudumDare29