changes in gitconfig and zshrc
Merge branch 'master' of github.com:sayanee/dotfiles

Conflicts:
	.gitconfig
	.zshrc