santi comit
Merge branch 'master' of https://github.com/elgildegerard/FrontEnd_TPGrupal_02

Conflicts:
	css/main.min.css
	css/main.min.css.map
	index.html
	scss/main.scss
Corrección jueves