changed some stuff
Merge branch 'master' of https://github.com/RickardPettersson/LungoJSTestWithBarcode

Conflicts:
	index.html