first commit
Merge branch 'master' of github.com:baocaixiong/pyhrm

Conflicts:
	.gitignore