Added Collision

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

Conflicts:
	source/SceneManager/Objects/GameplayObjects/GamePlayObject.h
	source/SceneManager/Objects/GameplayObjects/MainCharacter.cpp
	source/SceneManager/Scene/GameplayScenes/PlaceholderLevel.cpp