changes to file
Merge branch 'master' of github.com:mpaf/Spoon-Knife

Conflicts:
	newfile