some lovely changes
merging
getting julia's code
getting julia's changes
Merge pull request #8 from kneekey23/Nicki

Nicki
Delete TwoBirds.v12.suo
sending results view with  map and search results into code stream
adding results view
Merge pull request #9 from kneekey23/sarabranch

Sarabranch
more code
parsing service class
added service for parsing json, accepting merge
Merge pull request #10 from kneekey23/twobirds-jw1

added parsing service and yelp response model, adding back in assembly references (hope that doesn't break)
new layout changes & results view
resolved conflicts for layout merge
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