modi all conf
Merge branch 'master' of https://github.com/lpcwww/dotfiles

Conflicts:
	.zshrc