Update merge conflict

refined our Gemfile and created some controllers/routes
added Devise and Pundit to Gemfile
added application policies with pundit