fix mergefix :)
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui