Meh, wrong commit message because I forgot to commit the merge first.
Merge branch 'master' of https://github.com/i-like-robots/GitHub-Page-Template

Conflicts:
	assets/_scss/molecules/code-highlight.scss