bug fixed
Merge branch 'master' of github.com:ContestHunter/ContestHunter

Conflicts:
	ContestHunter/Views/User/Show.cshtml