tuff
Merge branch 'master' of github.com:Ralt/.dotfiles

Conflicts:
        emacs