Text in text1
Text in text2
Merge branch 'text2'

Conflicts:
	README.md