sexto commit template
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/web/formulario.py
	src/web/historia/historia.py
	src/web/templates/base.html
terceiro commit persitencia