hmm
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	assets/scss/style.scss