saa
Merge branch 'master' of https://github.com/famersbs/opencv_study.git

Conflicts:
	tesseract_firsttest/src/tesseract_firsttest.cpp