Solucinando error en nota de entrega
"Agregadas llaves foraneas"
Creados foregein keys
Merge remote-tracking branch 'origin/cancan' into cancan

Conflicts:
	db/schema.rb