some changes in feature branch
Merge branch 'master' into feature/conflicting_feature

Conflicts:
	file1