Merge branch 'demo-test' into gh-pages

Conflicts:
	.sass-cache/ee5206b163319ff2ccb0323b453b1390474321b4/demo.scssc