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

Conflicts:
	Gemfile
	config/deploy.rb