This is a commit
Merge branch 'master' of https://github.com/gamaya/git-test

Conflicts:
	README.md