first commit
Merge branch 'test' of https://github.com/tom12003/cs246