Update index.html

edited on github
Merge branch 'master' of github.com:jlindop/Spoon-Knife
Update index.html

2
Merge branch 'master' of github.com:jlindop/Spoon-Knife

merged master
Update index.html

2 to 3
Merge branch 'master' into b1

Conflicts:
	index.html

 do the merge
change master index
change b1 index
Merge branch 'master' into b1

Conflicts:
	index.html

asdf
b1 change
master change i
Merge branch 'master' into b1

Conflicts:
	index.html

asdf