fs#it
Merge branch 'master' of github.com:junegunn/dotfiles

Conflicts:
	bashrc