Physics are now only mostly pitiful.
Merge branch 'master' of github.com:Scrumplesplunge/immolation-warehouse

Conflicts:
	ImmolationWarehouse/src/net/compsoc/ox/iw/MainGame.java
Merge branch 'master' of github.com:Scrumplesplunge/immolation-warehouse