saving changes. guiTina should still be buildable
Merge branch 'guiTina' of https://github.com/tina-wang365/UCRCS180Project into guiTina