fidgetting a bit.
merging in with master need to clean up a little
Merge branch 'master' of https://github.com/nathanisaac-s/taxday