Moved QR code and tox file to internal storage
Fixed merge conflict
Merge pull request #140 from ollieh/master

Moved QR code and tox file to internal storage