bugfix
Merge branch 'gh-pages'

Conflicts:
	_config.yml
Merge branch 'master' into gh-pages