Fixed conflict changes.
Merge branch 'master' of https://github.com/naoya320y/dotfiles
Modified RVM setting in .zshrc