Other
Merge branch 'master' of github.com:ignacy/.emacs.d

Conflicts:
        elisp/custom.el
        elisp/keys.el
        init.el