Performed some work on moving monsters
Merge remote-tracking branch 'origin/master'