题目模板
Merge branch 'master' of github.com:ContestHunter/ContestHunter

Conflicts:
	ContestHunter/Views/Contest/Show.cshtml