Temp fix for production
Merge branch 'master' into gh-pages
Remove _config.yml from git tracking
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
Add config file
Fix typo
Configure url properly