prueba html
README.md

ARCHIVO README
Delete NewFile.html
Borrado html
Delete holaMundo.java
Merge branch 'master' of ssh://git@github.com/CrisBull/carritoCompras.git
Loggin v1
Merge branch 'master' of ssh://git@github.com/CrisBull/carritoCompras.git
-
cambios
Merge branch 'master' of
ssh://git@github.com/CrisBull/carritoCompras.git

Conflicts:
	carritoCompras/WebContent/index.html