first commit
Merge https://github.com/jiangts/CS310