Redo Home
Main draft completed
Merge branch 'master' into gh-pages

Conflicts:
	images/spoon.jpg
	index.html
	style.css