añade mas al menu
Merge https://github.com/proyect-IPUC/new-ipuc

Conflicts:
	app/views/layouts/_navigation_links.html.erb
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/8c2b061e379a23e7c4d207adcf992462
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/development/sprockets/d585a06e2ee6203ccb04c8b84150d14d
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655