Final version.
Merge branch 'master' of https://github.com/webrot9/best_face_pose

Conflicts:
	src/main.cpp