Solved the bug with box-box collision
Merge branch 'master' of https://github.com/Merigrim/indafps

Conflicts:
	src/se/kth/csc/indafps/Wall.java
Added wall collisions
Merge branch 'master' of https://github.com/Merigrim/indafps

Conflicts:
	src/se/kth/csc/indafps/Entity.java
	src/se/kth/csc/indafps/Geometry.java
Merge fix