added graticule to gemfile
google map appears on page
fixed merge conflicts