Initial commit.
Merge branch 'master' of https://github.com/peterwalker78/cohort
Fixed conflict.