hw2 code finished
Merge branch 'master' of github.com:stella-shen/Multi_Media