first commit
addition to README
another comit
Merge branch 'master' of https://github.com/mihai-buha/test-git-repo

Conflicts:
	README.md

after losing origin