commit before merge
resolving conflicts
added category and days to db
Merge pull request #25 from tbuchanan/master

pull