probando
Merge branch 'master' of https://github.com/masterclass/probando_git
Archivo modificado
Merge branch 'master' of https://github.com/masterclass/probando_git

Conflicts:
	index.php
adasd