jhgu

läjhlö
asdf

asdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bin/ImgProc.apk
	bin/classes.dex
	bin/classes/com/allan/imgproc/felix/FelixActivity.class