changes to search page
changes made to angular Merge branch 'dev' into marissa
search page
fix merge conflicts
small changes
Merge pull request #18 from Swap-Meet/marissa

Marissa minor changes