First Commit
Merge branch 'master' of github.com:chenzhu33/CBase

Conflicts:
	.gitignore