created format for rendering categories on the views/categories index page
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