TIY-Q3-ROR-CHS/Team5 — pull request #3 by CTFigueroa (2014-09-16 18:41:45+00:00)
Title: Update merge conflict

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