Removed the oh-my-zsh in master branch
Tmux config file init
Changed the ip alias to publicip (was in conflict)
zsh init
Merge branch 'zsh' of github.com:slariviere/dotfiles into zsh

Conflicts:
	oh-my-zsh