Connection
Merge branch 'master' of github.com:leonelquinteros/amigo