pase a produccion added
Merge branch 'master' of https://github.com/jcontreras000/Devise--CanCan--Bootstrap

Conflicts:
	config/routes.rb
	db/schema.rb