comments
Merge remote-tracking branch 'origin/fredrik' into fredrik

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/fredrik' into fredrik

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/fredrik' into fredrik

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/fredrik' into fredrik

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/fredrik' into fredrik

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/fredrik' into fredrik

Conflicts:
	.idea/workspace.xml
	src/se/kth/jpanegame/controller/PlayerController.java
	src/se/kth/jpanegame/model/PhysicsWorld.java
	src/se/kth/jpanegame/model/World.java
	src/se/kth/jpanegame/screens/GameScreen.java
Fixed box collisions,
Simplified collisions.