added cohort_controller as part of bart2_cohort integration with bart2
Merge branch 'master' of https://github.com/BaobabHealthTrust/bart2

Conflicts:
	change_log.txt