put dotfiles under the floder "dotfiles"
Merge branch 'master' of github.com:kanade123321/dotfiles

Conflicts:
	.tmux.conf
	.zshrc