adding Matthew's info
merge commit
Merge branch 'master' of https://github.com/uyxxx007/4061-proj3