Conflicts: .gitignore Gruntfile.js src/config.coffee src/css/style.css src/features.coffee src/features/posting/qr.coffee