Added Devise set up
merge issues