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
Checking a leaf checkbox will open up SearchActivity.
SearchActivity should work correctly for both Browse and Search.
Merge branch 'gui' of https://github.com/tina-wang365/UCRCS180Project into gui
Merge branch 'master' into gui
dont autoset email and authtoken on every comm instance
Main menu now displays username.
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui
minor changes to searchTask
made stuff public in category.java
Fixed BrowseActivity to work with newer SearchActivity
Merge branch 'gui' of https://github.com/tina-wang365/UCRCS180Project into gui
Merge branch 'gui' of ssh://github.com/tina-wang365/UCRCS180Project into gui
add scroll to make a recipe 3
Merge branch 'gui' of https://github.com/tina-wang365/UCRCS180Project into gui
Messing around mark2
Revert "Messing around mark2"

This reverts commit 3f95b82d0a145059ce0eccf738c0c4dd12eee4d0.

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