Adding oh-my-zsh
Merge branch 'master' of https://github.com/stevenweaver/dot_files

Conflicts:
	.gitmodules