fix player/npc bounding boxes
Merge branch 'master' of github.com:meredrica/agj2014