new level
New playermodel, new level with heights, and some

Merge branch 'master' of https://github.com/hanssonr/examensarbete

Conflicts:
	src/codename/core/src/main/java/se/rhel/model/BulletWorld.java