Agregando estilos
Fix stylesheets pageheader
add navbar
Merge remote-tracking branch 'origin/master' into blog

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.erb
fixed navbar
Merge branch 'blog'