Adding d
Merge branch 'master' of https://github.com/janzankowski/Spoon-Knife into featureaddingd

Conflicts:
	README.md
Merge branch 'featureaddingd'