link ocr to DB
Done OCR

```
$ vim app.rb
```
Merge branch 'master' into ocr_dpop

```
$ vim app.rb
```
Conflicts:
	app.rb
rename test2.cpp

```
$ git mv test2.cpp conversionToGray.cpp
```