Added line 1 local
Added line 2 local
Added linebreaks
Added line 5 local
Merge branch 'branch1'

Conflicts:
	README.md