create readme2.txt, update readme.txt second version
merge feature 2 

Conflicts:
	git_sample/src/readme.txt