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

Conflicts:
	ZYMessageConsensus/ZYMessageConsensus.xcodeproj/project.pbxproj
123
123
Merge branch 'master' of https://github.com/xuemeng101055/MessageConsensus

Conflicts:
	ZYMessageConsensus/ZYMessageConsensus.xcodeproj/project.pbxproj