This is going to conflict
Merge branch 'master' of github.com:seldo/seldo-dot-com

Conflicts:
	deploy.json