feature 1

readme and readme2 added
update readme.txt
update readme.txt 2
Feature2

Conflicts:
	git_sample/src/readme.txt
hotfix