added some text from branch1
added some text from branch2
added branch number
Merge branch 'branch1'
added some text to readme.md

Conflicts:
	README.md