.
Merge branch 'master' into gui
mergefix
Add MakeARecipePages1_2
swap conditions
gitignore classpath
Merge branch 'master' into gui
fix json parsing
comm2
Trying to output
Merge branch 'gui' of https://github.com/tina-wang365/UCRCS180Project into gui
added login failure message. Login working
added comments
mergefix
fix gitignore
changed class path
merge fixed
first pass at recipe ingredient parsing
getRecipe function filled out
Merge branch 'comm' of ssh://github.com/tina-wang365/UCRCS180Project into comm