Merge branch 'master' of https://github.com/ddm-victor/CS575