I have forgotten local change
Merge branch 'master' of github.com:never-wang/never

Conflicts:
	.gitconfig