More architecture
Expanded Entity class
Merge branch 'master' of github.com:Nexcius/PyGame

Conflicts:
	MoonLanding/entity.py