Uhm, some stuff, like ExternalPlayer.java can be viewed on Client
Fucking GIT
Merge branch 'master' of https://github.com/hanssonr/examensarbete

Conflicts:
	src/codename/core/src/main/java/se/rhel/screen/GameScreen.java
	src/codename/core/src/main/java/se/rhel/view/WorldView.java