Merge branch 'main'
Merge branch 'main'
Merge branch 'main'
Clase Conexiones
Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'main'
Merge branch 'main'
lunes3
Merge branch 'master' of https://github.com/ingdesoft5/ProyectoIngSoftware
Merge branch 'master' into main

Conflicts:
	Proyecto Ingeniería de Software/src/javagui/views/Oval.java