test for confilcts
Merge branch 'master' of ssh://github.com/newbuy/gitworkshop

Conflicts:
	README.md