linea base: crear, modificar y buscar
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/loginC.py