now what
Merge branch 'master' of https://github.com/oscarthecat/Spoon-Knife

Conflicts:
	README.md