Merge branch 'master' of https://github.com/Charlie-Y/CS147-project