Update README.md

git conflict test
git conflict
Merge branch 'master' of github.com:elvalad/gittest

Conflicts:
	README.md
another commit
update hello.c