change init.el
Merge branch 'master' of https://github.com/contaconta/dotfiles