added content to categories index view
merge conflict error
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
Merge pull request #16 from jgkingston/master

Added content to categories index view