Cleanup ControllerManager, add ModelDelegate notify
Adding nonfunctional menuobjects and menuMode, will be creating my own branch to work on these
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
Removing input along with ValueText from the Fighting team package
slight change to .gitignore
removed .classpath from .gitignore
Merge pull request #8 from duke-compsci308-spring2013/fightingteam

Fightingteam
cleaned up a conflict in .gitignore
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
removed sample .level files
bringing s_p up to speed with master
removed git conflicts