Working on implementing pathfinding for AI
merging
Pathfinding
Merge remote-tracking branch 'origin/master'

Conflicts:
	Platformer/Platformer.depend
	Platformer/bin/Debug/Platformer
	Platformer/src/Level.cpp