only one commit
add gitignore file
Merge branch 'master' into feature1
create file readme.txt
update readme file
update readme (second time) file
Merge branch 'feature2' into development

Conflicts:
	git_sample/src/readme.txt
fix in feature1