create cohort complete
fix merge conflict
Merge pull request #21 from spencerolson/bontgoy

create cohort complete