需要获取最新内容
Merge branch 'master' of https://github.com/Tjfa/Tjfa-iOS

Conflicts:
	Tjfa/Tjfa/CompetitionViewController.m