finished implementation for the five categories that was missing
Merge branch 'master' of https://github.com/trannosaurus/cs160