Minor changes before merge.
Merge branch 'master' of https://github.com/pingvini/pingvini.github.io

Conflicts:
	_includes/header.html