added stuff
Merge branch 'master' of https://github.com/wdhastings/Spoon-Knife

Conflicts:
	index3.html