added submodule qrcode
added submodule qrcode
Merge branch 'gh-pages' of github.com:glind/OSCON2014 into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:glind/OSCON2014 into gh-pages
cleanup of qr code
cleanup of qr code
fix