retarget almost done
Merge branch 'master' of https://github.com/whus6207/PatchMatch

Conflicts:
	src/Makefile