pycharm configuration file 'workspace.xml' (deskstop)
Merge branch 'master' of https://github.com/interxuxing/imageclef-proj

Conflicts:
	utils/.idea/workspace.xml