人肉merge
Merge branch 'master' of github.com:ContestHunter/ContestHunter