rvm
rvm
Merge branch 'master' of https://github.com/lis2/dotfiles

Conflicts:
	bash_profile
	zshrc