21a0bba285
Conflicts: Gruntfile.coffee builds/4chan-X.js builds/4chan-X.meta.js builds/4chan-X.user.js builds/appchan-x.js builds/crx.crx builds/crx/manifest.json builds/crx/script.js package.json src/code/main.coffee src/code/posting/qr.coffee src/css/burichan.css src/css/futaba.css src/css/photon.css src/css/style.css src/css/tomorrow.css src/css/yotsuba-b.css src/css/yotsuba.css src/features.coffee src/img/favicons/Original/unreadDead.gif src/img/favicons/Original/unreadNSFW.gif src/img/favicons/Original/unreadSFW.gif src/img/favicons/dead.gif src/img/favicons/empty.gif src/img/favicons/ferongr/unreadDead.gif src/img/favicons/ferongr/unreadNSFW.gif src/img/favicons/ferongr/unreadSFW.gif