Merge pull request #30 from chinenyem/master

using scss styled user interface page in angular/ruby application
added html descriptions for total and high score and ordered by total score
Merge pull request #31 from CTFigueroa/master

Added html descriptions for total and high score and ordered leaderboard by total score.
setting up pundit
set up pundit for user model and controller
added pundit to user model and controller
Merge pull request #32 from csrobinson86/master

Set up user model and controller with admin role
added routes in the add category and questions section
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
Merge pull request #33 from CTFigueroa/master

Added routes in the category and questions section to add new items as well as edit items.
fixed linking issue for play game in the header of the layout/application view and added link to edit category
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
Merge pull request #34 from CTFigueroa/master

Fixed linking issue for play game in the header of the layout/application view and added link to edit category.
set up conditional for admin in application layout
added conditional to application.html for admin role
Merge pull request #35 from csrobinson86/master

Added Conditional
fixed conditional error, wasnt allowing to play game
Merge pull request #36 from csrobinson86/master

fixed conditional error, wasnt allowing to play game
fixed merged conflicts