branchi sisään
jotain
Merge branch 'master' of github.com:BarCodeKey/BarCodeKey

Conflicts:
	.idea/misc.xml
Merge branch 'tihig'