Second commit
Merge branch 'master' of https://github.com/mbg033/Spoon-Knife

Conflicts:
	README
Resolved