Di first commit
Merge branch 'master' of https://github.com/hangfei/CIS505-Project