added categories button to nav bar
changed merge conflicts
Merge pull request #24 from brandonkwong/categories

Categories