I upload my codes and delete those I uploaded days ago.
Merge branch 'master' of https://github.com/Furong/team1_Lab3

Conflicts:
	TEAM1/common.h
	TEAM1/scanner.c