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

Conflicts:
	.gitignore
132
123