- git-sync-upstream
Merge branch 'master' of github.com:tonytamsf/dotfiles

Conflicts:
	bin/git-sync-upstream