pesky bug
Merge branch 'gh-pages' of https://github.com/mclear/nfcring-web into gh-pages