test.txt
Merge branch 'master' of https://github.com/ekuseru114/ResearchCode

Conflicts:
	Analyze/Python/Machine_Learning/CBIRSystem.py
bou