modified Gemfile to fix conflicts
added some fields to events model
Merge branch 'matthew'

ý5:q
Input of address for new events returns the latitude/longitude
json additions is api controllers and d3 styling
Added function Google Maps location for events/show.html
Merge branch 'matthew'

ý5qq:q
another try
updating the current events scope
Merge branch 'matthew'

ý5:q
Merge branch 'master' of https://github.com/msmilansky/Labradoodle into matthew

ý5:q
Merge branch 'matthew'

ý5:q
styling and partial rendering