Set pixel solid method
Merge branch 'master' of https://github.com/traff589/project-gamebrew

Conflicts:
	include/LevelMapParser.hpp
	include/TestLevelMapFactory.hpp
Conflict res