second line added
Merge branch 'master' into develop

Conflicts:
	develop.txt