git commit 9/25/14
Merge https://github.com/ThomasMorrissey/Spoon-Knife

Conflicts:
	README.md