Better slideshow
Merge branch 'gh-pages' of github.com:kaihendry/prazefarm into gh-pages

Conflicts:
	cottage/index.html
	curtains/index.html
	curtains/index.src.html