add info feature2/id
rebase feature4
add info
Merge commit '5747c1fc4780fb107219a15185302045968a4382'

Conflicts:
	git_sample/src/test_master.txt