added line between 1&2
added new file
Merge branch 'branch1'

Conflicts:
	README.md