Add wrk
Use rvm
Merge remote-tracking branch 'origin/master'

Conflicts:
	zshrc
Merge remote-tracking branch 'origin/master'