Removed tmux
Merge branch 'master' of github.com:taeram/dotfiles

Conflicts:
	.zshrc