added barcodes and log directory
Merge branch 'master' of https://github.com/pokulo/raSpBBery

Conflicts:
	.gitignore