zshrc
Merge branch 'master' of github.com:mitake/dotpack

Conflicts:
	zshrc
emacs: linux-c-mode