123
Merge branch 'master' of https://github.com/xuemeng101055/MessageConsensus

Conflicts:
	MessageConsensus/MessageConsensus.xcodeproj/project.pbxproj