MODIFIED: made state-specific tweaks to character object, map object, and game object
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Temporary commit while fixing null states/rectangles in collision manager bug