First commit
Merge branch 'master' of github.com:herimh/barcode-reader

Conflicts:
	.gitignore