Testing merge conflicts vim diff
Merge branch 'master' of github.com:osclars/hello-world

Conflicts:
	test