Updates
Merge branch 'gh-pages' of https://github.com/ndmitchell/shake-website into gh-pages

Conflicts:
	about.html
	demo.html
	developing.html
	favicon.ico
	index.css
	index.html
	manual.html
	model.html
	ninja.html
	why.html