darren's attempt at Recipe to JSON function
Merge branch 'comm' of ssh://github.com/tina-wang365/UCRCS180Project into comm
Merge branch 'comm' of ssh://github.com/tina-wang365/UCRCS180Project into comm
r.java crap
Merge branch 'gui'
made the test cases in HighlanderChefTest.java and it works(before merge)
fixed merge error
appcompat garbage
add some logging to comm
mergefix
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui