Merge branch 'gui' of https://github.com/tina-wang365/UCRCS180Project into gui

Conflicts:
	HighlanderChef/.classpath
Merge branch 'gui' of https://github.com/tina-wang365/UCRCS180Project into gui