aviso legal creado
Merge remote-tracking branch 'origin/devel' into devel
cambios en el index
 cambios index fer
Nuevos servicios.
Mejorando estilos.
Enlazando en el menu.
Merge remote-tracking branch 'origin/devel' into devel
Merge branch 'devel' into mas_mejoras_servicios
dfasdfasdf
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	index.html
Merge commit '0b4aba8a7b3943df75fc2738d344e325cdc9444d' into devel
Larga dur 1
Larga dur 2
Larga dur 3
Larga dur 4
Larga dur 5
Larga dur 5
Merge branch 'devel' into features/larga_duracion

Conflicts:
	contacto.html
fer hmtl