#update log
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git

Conflicts:
	doc/Team_logs_1.1.xlsx