changed url
Merge branch 'master' of github.com:chaospott/site

Conflicts:
	_config.yml