daily commit
add cr alias
Merge branch 'master' of github.com:gaohaoliang/dotfiles

Conflicts:
	vimrc