edited seed file to avoid infinity value error
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
eager loading categories
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
changed variable name in csrf token block
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.
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
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
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
styled UI so be consecutive
fixed merged conflicts
Merge pull request #37 from chinenyem/master

styled UI so be consecutive
nav bar tweaks
finish styling  UI
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
Merge pull request #38 from chinenyem/master

	finish styling UI