added favorite spots and search spots
merge conflict fixed
browse issue
Merge pull request #51 from msh345/fixing_browse_bug

Fixing browse bug