first commit
Merge branch 'master' of github.com:haision/GitHub_C

Conflicts:
	uname.txt
Merge branch 'master' of github.com:haision/GitHub_C
111