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

Conflicts:
	.gitignore