cool
Merge branch 'master' of github.com:deshawnbw/env

Conflicts:
	conf/git/gitconfig
Merge branch 'master' of github.com:deshawnbw/env
Merge branch 'master' of github.com:deshawnbw/env

Conflicts:
	conf/zsh/zshrc
removed group directories from ls