wait for pull
Merge branch 'master' of github.com:ContestHunter/ContestHunter

Conflicts:
	ContestHunter/Controllers/ProblemController.cs