merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	Platformer/Platformer.cbp
	Platformer/Platformer.layout
	Platformer/bin/Debug/Platformer
	Platformer/include/Level.h
	Platformer/include/PathFinder.h
	Platformer/src/GameScreen.cpp
	Platformer/src/Level.cpp
	Platformer/src/PathFinder.cpp