debug
Merge branch 'master' of http://github.com/kylox/OCR

Conflicts:
	main.ml