Insertando a la BD
terminado..
Insertando a la BD
Merge origin/master

Conflicts:
	README.md