created file readme.txt
update readme.txt
update readme.txt
commit readme
commit
Merge branch 'feature2' into dev

Conflicts:
	git_sample4/src/readme.txt
commit readme.txt feature3
Merge branch 'feature3' into dev
feature4 1
feature 4 2
feature 4 added readme3.txt
Merge branch 'feature4' into dev