salesreport.php done
Merge remote-tracking branch 'origin/master'

Conflicts:
	salesreport.php
Merge branch 'master' of https://github.com/zilunpeng/cs304Project