forced commit
Merge branch 'master' into category_view
forced commit
Merge branch 'master' into category_view
forced commit
Merge branch 'master' into category_view
forced commit
Merge branch 'master' into category_view
forced commit
Merge branch 'master' into category_view
Merge branch 'master' into category_view
Merge branch 'master' into category_view
Merge pull request #5 from zcurchin/category_view

Category and Artist views added