merge conflict creation
commiting the fix for the merge conflict

Merge branch 'master' of https://github.com/toppledwagon/hello-git-world

Conflicts:
	second.txt