Merge branch 'gh-pages'
Update to labels

Not yet displaying
Merge branch 'master' into gh-pages
Change gh-pages theme

Conflicts:
	index.html