Define git-sync zsh-function for synchronize origin:master with upstream:master
Shorter alias for sweeping merged local/remote branches
Merge branch 'master' of github.com:kmizu/dotfiles

Conflicts:
	.zshrc