plain contest page under /contest
Merge branch 'master' of https://github.com/YiboDuan/hearthstats

Conflicts:
	app/views/additional/contest_video.slim