Initial imageproc
Merge branch 'master' of https://github.com/sjg10/glass-context.git
Merge branch 'master' of https://github.com/sjg10/glass-context.git
ImageProc TextRec Working
Merge branch 'master' of https://github.com/sjg10/glass-context.git
Merge branch 'master' of https://github.com/sjg10/glass-context.git
Install tessdata begun
Merge branch 'master' of https://github.com/sjg10/glass-context.git
Manifest fix
Merge branch 'master' of https://github.com/sjg10/glass-context.git
Working OCR-Untestes
Merge branch 'master' of https://github.com/sjg10/glass-context.git

Conflicts:
	Context/src/com/coolrunnings/context/MainActivity.java