new file:   .gitconfig
Merge branch 'master' of github.com:ChiWang/LinuxOS

Conflicts:
	.gitconfig
	deleted:    .gitconfig