notengo  idea
Merge branch 'master' of https://github.com/odv144/odvsystem

Conflicts:
	pruebas.txt