#1 subiendo a git
Merge branch 'master' of github.com:Zirex/cgr-app.git