playing with capybara testing; set up only
error with selenium webkit-driver; trying to fix
Changes and refator to yelp api calls on click

Includes plotting of markers on google map, and style refactoring to use the grid system for search results and googlemap
Merge pull request #20 from mlcrazy/yelp_api

Changes and refator to yelp api calls on click
Capybara testing; fix; add 3 test all pass; new gem launchy

a few things were incorrect per mentor Matt; Gemfile updated 2 tests added and require rails helper not spec helper
HTTPS
http
Merge branch 'master' into capybara_testing

Conflicts:
	app/views/searches/index.html.erb
Merge pull request #21 from mlcrazy/capybara_testing

Capybara testing
Changes to yelp api parameters
Merge pull request #22 from mlcrazy/gmaps_marker_info

Changes to yelp api parameters
Merge branch 'master' into kenn_m_lightbox_v2

Conflicts:
	app/views/layouts/application.html.erb