Adjusts the Gemfile
Moves the new migrations
Solves some errors on mergin
Makes the devise routes work