Menú actualizado
Merge branch 'master' of https://github.com/WilliamRojas/PROYECTO

Conflicts:
	app/assets/stylesheets/bootstrap.css
	app/assets/stylesheets/scaffolds.css.scss
	config/routes.rb
	db/schema.rb
	db/seeds.rb