Merge Issues fixes
Merge pull request #3 from jacobSquawka/feature/issue_yesterday_commit

Fix Issue with development merge