boring
Merge branch 'master' of https://github.com/trev311/dotfiles
zshrc
importing old bashrc into zshrc