qr stuff
Merge branch 'master' of https://github.com/PeVeDude/U3_2ME107

Conflicts:
	qr/qr.html
wfdwef