Slope support
Merge branch 'dev-trf'
Scrolling
Entity-Entity Collisions
LevelMapParser
Merge branch 'master' of https://github.com/traff589/project-gamebrew

Conflicts:
	include/Entity.hpp
	include/HitBox.hpp
	include/TestLevelMapFactory.hpp
	src/Entity.cpp
	src/HitBox.cpp