delete files
Merge branch 'master' of https://github.com/pcostan/CapoDiSerapo
Merge branch 'master' of https://github.com/pcostan/CapoDiSerapo

Conflicts:
	about.html
	contact.html
	css/bootstrap.css
	css/global.css
	form/contact-us.html
	inc-files/footer.htm
	inc-files/navgation.htm
	inc-files/pre-order-form.htm
	inc-files/social.htm
	inc-files/tracking.htm
	index.html
	js/bootstrap.js
	our-products/deco-blight.html
	our-products/deco-garnet.html
	our-products/deco-reef.html
	our-products/finis-cobalt.html
	our-products/finis-rose.html
	our-products/index.html
	our-products/pardus.html
	our-products/tempestas-in-bluette.html
	our-products/tempestas-in-forest.html
	our-products/tempestas-in-grey.html
	our-products/tempestas-in-violet.html
	policy.html
	pre-order.html
	terms-conditions.html
	thank-you.html