maybe this works
Merge branch 'master' of https://github.com/SimonVuong/336-project