first commit
Merge pull request #1 from yx887/master

Assignment 5 Yijun Xiao