alright
gods, forgive me
Merge branch 'master' of https://github.com/Helldevastator/IGS

Conflicts:
	cbir/src/CbirWithSift.java
	cbir/tests.txt