Fix url problem
Merge branch 'jekyller' into gh-pages

Conflicts:
	_config.yml