Merge pull request #49 from duke-compsci308-spring2013/fightingteam

Sorry this is so late.  We have had working code since last night, but we accidentally used eclipse's clean up function on all of the src code, which created a nightmare of merge conflicts with everyone else's code.  Unfortunately, after about 6 hours of trying to figure this out, the only way we could do it was by overwriting the conflicts (meaning that our clean up has affected all files).  This should NOT change the functionality of any of the src code, but MAY create merge conflicts for other groups.  We are sorry, but this was the only way we could do it after scouring the internet.

Jack and Jerry
Final change to Main...
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam