owl carousel para el slider de proyectos
Merge branch 'master' of https://github.com/8manos/website

Conflicts:
	wp-content/themes/otto/css/styles.css
	wp-content/themes/otto/css/styles.css.map
css de compass comprimido
Merge branch 'master' of https://github.com/8manos/website