Fix conflicts
Merge branch 'master' of github.com:masatana/dotfiles
Add something
Merge branch 'master' of github.com:masatana/dotfiles