Merge branch 'master' of github.com:kakakaya/dotfiles into develop
init.el:re-initialized
Merge branch 'develop' of github.com:kakakaya/dotfiles