Add Entity class
Merge branch 'master' of https://github.com/Gjum/Jetpack

Conflicts:
	src/main.cpp
Some progress