Cambio linea 319

MC
Merge remote-tracking branch 'origin/master'

Conflicts:
	home.html
Quitar comments de git