some description of Emotions in ACT and OCC Model of emotion is added.
some description of Emotions in ACT and OCC Model of emotion is added.
Merge branch 'master' of github.com:zeeshanmmalik/affect_control_theory