add info. feature1
add info 2. feature1/ID

desc
add info. feature2
Merge remote-tracking branch 'origin/feature2' into dev

Conflicts:
	git_sample/src/readme.txt