fixed merge conflict with occupying
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga