merge and dataset formating
merge
Merge branch 'master' of https://github.com/Neodyme/ocr

Conflicts:
	__main__.py
	preprocess/bounding.py