Made a few small tweaks.
Merge remote-tracking branch 'origin/master'
Squashed a bug involving player-monster collisions.