agregando devise cancan y rolify
agregando merge