changes to search page
changes made to angular Merge branch 'dev' into marissa
Merge pull request #17 from Swap-Meet/g-details

G details
search page
fix merge conflicts
small changes
Merge pull request #18 from Swap-Meet/marissa

Marissa minor changes
merging
merging again
added linters to grunt-serve and fixed lint issues
Merge pull request #19 from Swap-Meet/gruntwatchfix

added linters to grunt-serve and fixed lint issues
changes to modules
merge
mergeMerge branch 'dev' into g-details
changes to grunt files Merge branch 'dev' into marissa
Merge pull request #20 from Swap-Meet/marissa

Marissa
merge
formatting game details