working on smoke example
Merge remote-tracking branch 'origin/master' into mike-examples1
Merge branch 'master' into mike-examples1
Porting the smoke example from tuffy.
Merge branch 'master' into mike-examples1
fixing merge conflict
fixing conflicts
Merge branch 'master' into mike-examples1
Updating smoke example
Added example: Logistic Regression for OCR
Merge branch 'master' into mike-examples1
Smoke example
Added example: Logistic Regression for OCR
Merge branch 'master' of github.com:zifeishan/deepdive

Conflicts:
	examples/ocr/run.sh
Modified configuration and run.sh
Fixing conflict
Smoke example removing unneeded folders
Added Feature Names
Merge pull request #14 from zifeishan/master

Adding OCR Logistic Regression Example
Updated OCR readme.