added .txt files option to weighted_average
Merge branch 'master' of https://github.com/nouiz/lisa_emotiw