Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
fixed up pixmap that was pulled from master
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam