Merge pull request #14 from chinenyem/master

styling rails
added content to categories index view
created format for rendering categories on the views/categories index page
merge conflict error
updated merge conflict
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
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
style