Commit the fix on file2fix.txt
Merge branch 'master' of https://github.com/mangint/Spoon-Knife

Conflicts:
	file2fix.txt