Worked on stuff
Merge branch 'master' of
https://github.com/felix-angell/jed-the-space-man

Conflicts:
	src/jed/the/space/man/game/entity/Entity.java