Merge remote-tracking branch 'slipson/master'
player moves better
Merge remote-tracking branch 'aschin/master'
attempt to restore Adam's changes