Merge branch 'master' of https://github.com/vegaro/interfaces-final into Javier
js
Añadido cines y cabeceras
Merge remote-tracking branch 'origin/Javier'

Conflicts:
	compra.html
	css/style.css
	index.html
Arregla la cruz de packery