subiendo mi parte 50%
Merge branch 'master' of https://github.com/RudyEscalera/zooepagina

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb