harris
Merge branch 'master' of https://github.com/MoritaYasuaki/opencv_test

Conflicts:
	test.sh