reupdate
Merge branch 'master' of https://github.com/x26lu/CS246