latest changes
Merge branch 'master' of github.com:learnjin/dotfiles

Conflicts:
	.zshrc