added testing for models
changed view for merge conflicts
Merge pull request #13 from brandonkwong/categoriesmodel

added testing for models