working on thesis
resolved conflict
added questionnaire responses
Merge branch 'master' of https://github.com/Faham/emophiz