Merge branch 'master' of https://github.com/ourteamLemon/ExamTreasured

Conflicts:
	.DS_Store
	ExamTreasured/MiddleViewController.m
ljm
Merge branch 'master' of https://github.com/ourteamLemon/ExamTreasured

Conflicts:
	.DS_Store
	ExamTreasured/MiddleViewController.m
ljm
ljm