More merge fixes
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam