otra mas
Merge branch 'master' of https://github.com/ccbernal38/Proyecto_Semillero

Conflicts:
	css/style.css