eliminar archivo coffee
adaptando eventos de scrolling al navbar
Agregando efectos al navbar
fix stylesheets
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/staticpage/index.html.haml
fix navbar
Terminada rimera version del navbar
Merge remote-tracking branch 'origin/master'

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