New file add
Merge branch 'master' of github.com:jtwp470/dotfiles

Conflicts:
	ubuntu/.zshrc
Add .zshrc