Release 1.0
trying to fix this shit
Merge branch 'master_copy'

Conflicts:
	assets/css/recoopero.css
	assets/img/marketing/sofa1.png
	assets/img/marketing/sofa2.png
	assets/img/productes/sofa2.png
Merge branch 'master' into gh-pages