added text
Added some other text
Merge branch 'test-other'

Conflicts:
	README.md