merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	Platformer/Platformer.depend
	Platformer/Platformer.layout
	Platformer/bin/Debug/Platformer
	Platformer/res/lvls/entropy.dat
	Platformer/src/Level.cpp
Working on AI for enemies
merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	Platformer/Platformer.depend
	Platformer/Platformer.layout
	Platformer/bin/Debug/Platformer
	Platformer/include/Level.h
	Platformer/res/lvls/entropy.dat
	Platformer/src/GameScreen.cpp
	Platformer/src/Level.cpp