added leaflet gem
added map
latest version of the map and layout
deleted example folder
resolved conflicts
Merge remote-tracking branch 'upstream/master'
continuing work on getting click functionality with the map
added map hover capability
merged
added marker setting functionality with foursquare api.
adding binding popup with info to markers
checking in. no major changes
added searching by button functions
can get object from favorite click
added favorites. added favorites, users, cities table. added json calls to controller. able to add favorite pins to map.
added default city pins
added click zoom on default city markers
added yelp functionality
working on chaning popup text to yelp data
changes from Tuesday on