testy
Merge branch 'master' of https://github.com/mkamionka/SIFTObjectModel

Conflicts:
	testy