generating qr code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	requirements.txt
	src/templates/index.html
	src/web.py
remove commented code
Merge pull request #6 from diegosarmentero/master

Generating QR Code