capistrano
Merge branch 'master' of github.com:cotocisternas/ayudar.te

Conflicts:
	Gemfile.lock
Gemlock merge