P1..
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/Practica1/index.html
	WebContent/Practica1/style.css
Merge remote-tracking branch 'origin/master'
structure P1