Fix contest view
Merge branch 'master' of https://github.com/ging/vish into storyrobin
Merge branch 'workshopstyle' of https://github.com/ging/vish into storyrobin