peter 9:22
Merge branch 'master' of https://github.com/xuemeng101055/MessageConsensus

Conflicts:
	ZYMessageConsensus/ZYMessageConsensus.xcodeproj/project.pbxproj

ZYMessageConsensus/ZYMessageConsensus/ViewControllers/MainViewController
s/Today/ZYTodayViewController.m

ZYMessageConsensus/ZYMessageConsensus/ViewControllers/ZYLoginViewControl
ler.m