Merge branches 'gui' and 'comm' of ssh://github.com/tina-wang365/UCRCS180Project into comm
Merge branch 'gui' into comm