Conflicts: Gruntfile.js src/features.coffee src/main.coffee
Conflicts: lib/$.coffee lib/ui.coffee src/config.coffee src/features.coffee src/main.coffee src/qr.coffee Also added a proper Chrome build. I'mma have to save my pem file...