Final change to Main...
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Merge pull request #50 from duke-compsci308-spring2013/fightingteam

Final changes in main, eclipse package statement was wonky