final edit
Merge branch 'master' of
https://github.com/drozado/facialExpressionRecognitionPaper.git

Conflicts:
	document.tex