Nytt vapen, ny animering
Merge branch 'master' of https://github.com/hanssonr/examensarbete

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