Updates
Merge branch 'master' of github.com:simonswain/hubris

Conflicts:
	demo/style.min.css
	dist/css/style.min.css
Fix