le cambie el nombre
Merge branch 'master' of https://github.com/Tinajero/gitTest

ya le cambie un

Conflicts:
	prueba.html
multilen message
i wrote a lot whit this but i dont know how to get ou of this