master mark charactor b
Merge branch 'master' of github.com:464082321/git_test

Conflicts:
	conflicts.cc