Commit inicial
Configurar db sqlite3
Resolver conflictos
Resolver conflictos
Merge branch 'master' of github.com:julianvargasalvarez/pila