second commit
Merge branch 'master' of https://github.com/mxmeng/280Project1