add
Merge branch 'master' of github.com:seeward/BarcodeDemo

Conflicts:
	js/index.js