took out a couple lines i changed last night. should have no effect on building or anything
fixed merge conflict
jk now fixed all merge conflict last commit did nothing
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui
added server error code
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui