Merge pull request #3 from ndavis10/master

Update from upstream
j
changed stuff
Merge pull request #15 from mcarpenter5/master

Added Category