README.md new line user 1 release
some stuff from user 1 from master branch
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	README.md

conflict resolved by user 2
Merge branch 'master' into release

Conflicts:
	README.md