local changes
Merge branch 'master' of https://github.com/bornreddy/Feature-Matching

Conflicts:
	Makefile