nav update
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  carousel telefonos

Conflicts:
	app/assets/stylesheets/_styles.css.scss
	app/views/inicio/index.html.haml