いらんやつ消した
Merge branch 'master' of github.com:sachin21/oh-my-zsh

Conflicts:
  lib/aliases.zsh
  plugins/rails/rails.plugin.zsh