asd
Merge branch 'master' of github.com:jmtast/computacion-movil
choose type user, and register