add item1 to feature3
add item1 to feature3
bug#1 fix for feature1
Merge branch 'feature3' of github.com:coolbsd/git-test into feature3

Conflicts:
	README.md
add item1 to feature4
add item2 to feature4
add item1 to feature3
Merge branch 'feature4' of github.com:coolbsd/git-test into feature4

Conflicts:
	README.md