Fix (I hope)
Merge branch 'master' of https://github.com/gyeben/gyeben.github.io

Conflicts:
	_config.yml