Using GUI to commit old files.
updating modified files from master
added an extra comment line
Merge branch 'master' into testbranch
Remove Spoon-Knife

Conflicts:
	Spoon-Knife