added new line3
Added additional lines.
Updated README file
2nd version of readme
Merge branch 'foo_feature'

Conflicts:
	README
first line of file 1
text to file uno
Merge branch 'foo_feature'

Conflicts:
	file1