Merge pull request #1 from bradenedmunds/working

Working
Merge branch 'master' of https://github.com/bradenedmunds/childcareapp into working