Merge pull request #3 from ndavis10/master

update from stream
Merge pull request #3 from ndavis10/master

Update from upstream
Merge pull request #14 from Barterdm04/master

Merge pull request #3 from ndavis10/master
j
changed stuff
Merge pull request #15 from mcarpenter5/master

Added Category
Merge pull request #16 from mdeboer1/master

Merge pull request #4 from ndavis10/master
Merge pull request #5 from ndavis10/master

update from upstream