test
test
fix program option and matcher
Merge branch 'master' of git@github.com:sakamoto1092/panorama_plane.git

Conflicts:
	.cproject
	.project
	Debug/makefile
	Debug/objects.mk
	Debug/src/3dms-func.o
	Debug/src/mysurf_panorama_plane.o
	composition_log.txt
	img/img_6.jpg
	img/sobel_img_6.jpg
	mat_homography.txt
	panorama.avi
	src/mysurf_panorama_plane.cpp
	transform4.jpg