settings v1
Merge branch 'desarrollo' of github.com:alu0100207385/SocialManager into desarrollo
subiendo a heroku