Changes to parse.cc
Merge branch 'master' of https://github.com/spqchan/EmotionRecognition

Conflicts:
	AwesomeFaceTracking/Data/Smile/parse.cc