stuff
PHYSICS BITCH
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/ilusionstudios/siege/model/Hitbox.java
	src/main/java/de/ilusionstudios/siege/xghost/actors/Terrain.java
	src/main/java/de/ilusionstudios/siege/xghost/main/Main.java
Fix merge