subir historial
Merge branch 'master' of https://github.com/gzjrm/actividadcursoasl

Conflicts:
	historial.txt
Merge branch 'master' of https://github.com/gzjrm/actividadcursoasl