Added user model + devise
Added user model + devise
merged