Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Astonex/Antox
fix typo and move qr things to completed
Merge pull request #54 from dethstar/master

Fix typo and move qr things to completed