added content to categories index view
merge conflict error
Merge pull request #15 from CTFigueroa/master

created format for rendering categories on the views/categories index page
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
Merge pull request #16 from jgkingston/master

Added content to categories index view
sytling devise
Merge pull request #17 from chinenyem/master

styling devise
added categories and questions to seed.rb file, yay math
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
Merge pull request #18 from jgkingston/master

Populated seed file
created angular portions for the mathGame