Merge branch 'arcade' of
https://github.com/duke-compsci308-spring2013/vooga into arcade_view
merge conflict