Messing with physics
Merge remote-tracking branch 'origin/master' into game
Better physics