First OCR commit, program crash
Wow! It works! Not reliably
Merge branch 'OCR' into new_master
change line ending
fix menifest warning
line ending stuff
more line ending stuffs
fix conflicts
build files
Merge branch 'new_master'