jättelätt

La till descriptor (SIFT) å en matcher mellan 2 bilder. Håller kamera
instanser 20 bildhäptningar tillbaka i nuläget. Funkar ej, krashar
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ImgProc.apk
	bin/classes.dex
	bin/classes/com/allan/imgproc/oliver/OliverActivity.class
	bin/dexedLibs/opencv library -
2.4.9-20fb805e1d2d3b51580f2b9a7ce00c17.jar
	bin/resources.ap_