(to be continued....)
Merge branch 'master' of github.com:ikuwow/PatchMatch

Conflicts:
	PatchMatch.m
	testPatchMatch.m