some lovely changes
merging
more code
Merge pull request #11 from kneekey23/sarabranch

Sarabranch
added google api methods in controller and js fxs too
hi there
Merge pull request #12 from kneekey23/meltastic

Meltastic
changes
Merge branch 'master' into meltastic
Merge pull request #13 from kneekey23/meltastic

Meltastic
upgraded Json.net; added error-handling to yelp api; added js ajax infrastructure
changes to webapi; ajax call set-up
Merge pull request #14 from kneekey23/twobirds-jw1

updated webapi; established ajax infrastructure
fixing missing json.net reference
Merge branch 'master' into twobirds-jw1
Merge pull request #15 from kneekey23/twobirds-jw1

added missing json.net reference
some layout and result pg changes but mostly just pulling down new code
Merge branch 'master' into sarabranch
getting latest
Merge branch 'master' into meltastic