Merge branch 'master' of https://github.com/streamtube/proyecto

Conflicts:
	recursos/css/estilo.css
Merge branch 'master' of https://github.com/streamtube/proyecto

Conflicts:
	recursos/css/estilo.css
Merge remote-tracking branch 'origin/master'