Något är fel med datan/paket-storlek etc, men det fungerar nu

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/codename/core/src/main/java/se/rhel/model/Player.java
Merge branch 'master' of https://github.com/hanssonr/examensarbete

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