add affective tutor and dkb
Bring in stuff that Amin did
Merge branch 'master' of github.com:pitosalas/cosi236b