added entity and level stuff
fixing merge
merging fixes
Merge branch 'master' of https://github.com/felix-angell/jed-the-space-man

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

Signed-off-by: felix-angell <felix.angell15@gmail.com>