DELETE
Merge branch 'master' of https://github.com/Agezx/origin

Conflicts:
	Spoon-Knife
	index.html