Rollback to start
Merge branch 'master' of https://github.com/prenderj/engine

Conflicts:
	include/Entity.hpp
	include/GameEngine.hpp
	src/GameEngine.cpp
	src/Main.cpp