整理
Merge branch 'master' into cygwin

Conflicts:
	.bashrc
__git_ps1
Merge branch 'master' into cygwin
.profile
Merge branch 'master' into cygwin

Conflicts:
	.profile