Everything at home

I should check how to pull and push works.
Merge branch 'master' of https://github.com/MugGit/QdqRepository

Conflicts:
	landingCatalogo/contacto.html
	landingCatalogo/servicios.html
	landingCatalogo/stylesheet/modules/button.css
	landingCatalogo/stylesheet/modules/button.less
	landingCatalogo/stylesheet/partials/contacto.css
	landingCatalogo/stylesheet/partials/contacto.less
	landingCatalogo/stylesheet/partials/servicios.css
	landingCatalogo/stylesheet/partials/servicios.less