Conflicts: CHANGELOG.md CONTRIBUTING.md Gruntfile.coffee package.json src/Miscellaneous/Keybinds.coffee