Temporary commit for merge
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
score controller works
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
NEW: Modified package hierarchy
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Fixed bugs with attack object clone
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
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
Merge pull request #5 from duke-compsci308-spring2013/fightingteam

Fightingteam