Conflicts: LICENSE builds/4chan-X.js builds/appchan-x.user.js builds/crx/script.js src/General/Main.coffee src/General/css/style.css src/General/html/Settings/Advanced.html
Conflicts: LICENSE builds/4chan-X.js builds/appchan-x.user.js builds/crx/script.js src/General/Main.coffee src/General/css/style.css src/General/html/Settings/Advanced.html