Conflicts: CHANGELOG.md src/General/Config.coffee src/General/Main.coffee src/General/lib/$.coffee src/Miscellaneous/Time.coffee
Conflicts: CHANGELOG.md src/General/Config.coffee src/General/Main.coffee src/General/lib/$.coffee src/Miscellaneous/Time.coffee