for git hook
test git commit hook
for git hook test
for git hook test
for hook
first commit
Merge branch 'master' into zp
clear pyc file from repository
Merge branch 'tq'

Conflicts:
	triWeb_backend/MultiRunCounter.pyc
	triWeb_backend/db_connector.pyc
	triWeb_backend/logger.pyc
merge from alex version
remove pyc file
Merge pull request #2 from bellcliff/master

Merged from zongping and tangjing