Merge branch 'rickey' of https://github.com/simdugas/childcare
Merge branch 'master' of https://github.com/simdugas/childcare