Update _config.yml
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	_config.yml