Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into arcade
Merge branch 'arcade_view' of https://github.com/duke-compsci308-spring2013/vooga into arcade
fixed merge conflicts
high score heading for ScoresView