Testing out git commands a little
testing merge
creating a merge conflict.
Merge branch 'test-branch'

Conflicts:
	README