Temporary commit for merge
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Removed non-fighter files from branch, few intermediary tweaks to objects
Removed non-fighter files, intermediary tweaks to model