Partial solution to timelines, requires breaks in care merge
Merge branch 'master' of https://github.com/scott-thomson/carers