test
Merge branch 'master' of https://github.com/ismo-conguairta/Spoon-Knife

Conflicts:
	README
test patch