slightly updated categories
merge conflict
Merge pull request #29 from brandonkwong/dalton

slightly updated categories