merged.
Merge branch 'master' of https://github.com/aiya000/dotfiles

merged!!!