fixed merged conflicts
partially fixed mere gconflicts
merge conflict fixes
Merge branch 'arcade' of github.com:duke-compsci308-spring2013/vooga into arcade
removed old example game