newfile cleaned up in feature branch
Merge branch 'master' into feature

Conflicts:
	newfile