Merge branch 'master' of github.com:hiracchi/my_skel
Merge branch 'master' of github.com:hiracchi/my_skel
Merge branch 'master' of github.com:hiracchi/my_skel
Merge branch 'master' of github.com:hiracchi/my_skel
for rbenv
Merge branch 'master' of github.com:hiracchi/my_skel

Conflicts:
	zsh/.zshrc