reset
renewal
Merge branch 'renew'

Conflicts:
	.tmux.conf
	.vimrc
	.zsh/alias.zsh
	.zshrc
	zsh/oh-my-zsh