local_change
wqMerge branch 'master' of https://github.com/ydrant/doties

Conflicts:
	bin/scm_status.py
	zsh/zshrc
missing file