undergrad version
Merge branch 'master' of https://github.com/emily-li/gws