Temporary commit for merge
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Temporary commit for merge
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
MODIFIED: Tweaked collision handling framework, fixed hitbox rectangles not being updated to be relative to object location
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam