Trying to fix strange github behavior
Merge branch 'develop' of github.com:massenz/babysitter into develop