Wensi's draft first commit
Merge branch 'master' of https://github.com/wensiqiu/IS428-Project