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.
added conditional to application.html for admin role