edited jajajaja
Merge branch 'master' of https://github.com/veb61/Spoon-Knife

Conflicts:
	README.md