Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.sass-cache/972aab62d65e9aed2bfbd5a225d52096f5d92c10/_main.sassc
	.sass-cache/972aab62d65e9aed2bfbd5a225d52096f5d92c10/_mixins.sassc
	_includes/footer.html
	_layouts/blog-article.html
	_layouts/lab-article.html
	_layouts/master.html
	_sass/_main.sass
	_sass/_mixins.sass
	blog/index.html
	config.yml
	css/style.sass
	index.html
	portfolio/index.html
	script/page-script.js
	script/smoothState.js