fix deploy.rb
Merge branch 'master' of github.com:ThiagoAnunciacao/cloudesk

Conflicts:
	Gemfile.lock
	config/deploy.rb