com2
Merge branch 'master' of https://github.com/trykowski1/Spoon-Knife

Conflicts:
	index.html