craft update
Merge branch 'master' of https://github.com/fogleman/Website

Conflicts:
	www/templates/craft.html