errors out of controller
Merge branch 'arcade' of github.com:duke-compsci308-spring2013/vooga into arcade