update from origin master
fixed merge conflicts
drop down menu of cohort members
Merge pull request #11 from tiger-swallowtails-2013/add_talk

Add talk