Resolving merge conflicts
Merge branch 'master' of https://github.com/qiezitx/Spoon-Knife

Conflicts:
	README