tinkering with map state
made changes to application.html.erb
made changes to application.html
uncommented jquery-rails gem
removed sprockets
made changes to map.html and application.html
fixed merge conflict
made changes to seed.rb and map.html
fixed merge conflict
Merge branch 'sophana'