initial commit
Merge branch 'master' of github.com:colegleason/ocr-server

Conflicts:
	.gitignore