first commit
basic setting done.
basic setting done.
Merge branch 'master' of github.com:mammoth-emperor/dotfiles

Conflicts:
	vim/.basic
	vim/.vundle
edit README.
add anipmate
update readme
update readme
up.. readme..
up.. read..
add ruby setting
add tmux conf
add grep setting
微調整
Merge branch 'master' of github:mammoth-emperor/dotfiles

Conflicts:
	.tmux.conf
	README