changed
Merge remote-tracking branch 'remotes/origin/master' into new-feature

Conflicts:
	file1