adding lightbox functionality
 tweeks to lightbox
Merge branch 'master' into kenn_m_lightbox

Conflicts:
	config/routes.rb
Merge pull request #19 from mlcrazy/kenn_m_lightbox

Kenn m lightbox
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
HTTPS
http
Merge branch 'master' into capybara_testing

Conflicts:
	app/views/searches/index.html.erb