Set up devise
Merge conflicts fixed