css,js de internet descargado a local
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/public/css/estilo.css