can pass params into rails, need to reverse geocode lat lng to get address for find
minor change to welcome_controller
completed sittings creation, started nearby location identification
switch issue
completed displaying locations on page with map
fixed merge conflict with sitting.js
fixed conflicts from merge, sitting.js, map.js, sitting.rb, application.html.erb, index.html.haml
coverage
resolved merge conflicts
writing some jasmine tests for map