fixed collision!
improved merchant scene
menu in buy scene working
add support for enter key and esc
fixed bugs
weird..fix
Merge remote-tracking branch 'origin/master' into JuanBranch

Conflicts:
	FinalProject/src/Manager/LevelManager.cpp
	FinalProject/src/Scene/NormalScene.cpp