made a change
Merge branch 'master' of https://github.com/softwear/someproject into secondbranch

Conflicts:
	file1