initial committtttt
merge from github
Merge branch 'master' of github.com:Sebfh/qr