bag of words
Merge branch 'master' of https://github.com/amatar07/Object-Category-Recognition

Conflicts:
	Main.cpp