Rename demo to index for demo page.
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Tighten up the spacing of the parcels.
Merge branch 'gh-pages'
Merged the wrong way.