cohort marker colors
Merge branch 'master' of https://github.com/billfienberg/student_tracker