Merge branch 's1' into develop
Merge branch 's2' into develop

Conflicts:
	first_develop_file.txt
Merge pull request #4 from aleksandaroj/develop

Develop