dm - b
dm - b1
Merge branch 'master' into datamanager
check point name
test
test
johnny dm test
Merge branch 'datamanager' of https://github.com/fengxuan-fx/own into datamanager
johnny01-dm
checkPoint
checkpoint
Merge branch 'datamanager' of https://github.com/fengxuan-fx/own into datamanager

Conflicts:
	checkPoint.txt
Merge branch 'master' of https://github.com/fengxuan-fx/own into datamanager

Conflicts:
	johnny.txt
test user
Merge branch 'datamanager' of https://github.com/fengxuan-fx/own into datamanager

Conflicts:
	checkPoint.txt