pulled
Merge branch 'master' of https://github.com/Tacahilo/.dotfiles

Conflicts:
	myvim
	myzsh