set site.url
Set gh-pages site.url
Merge branch 'master' into gh-pages

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

Conflicts:
	_config.yml