David Krueger's changes
Merge branch 'master' of https://github.com/nouiz/lisa_emotiw

Conflicts:
	scripts/final/integrated_pipeline.py