add local info 1 feature2/id
add info feature2/id
add info 2 feature2/id
Merge remote-tracking branch 'origin/feature2' into development

Conflicts:
	git_demo/src/readme.txt