merge to git pull
Merge branch 'master' of https://github.com/wilwong/csc309-v2
change the test file