refined our Gemfile and created some controllers/routes
added Devise and Pundit to Gemfile
added application policies with pundit
updated merge conflicts
Merge pull request #3 from CTFigueroa/master

Update merge conflict