Still attempting to get Eventful API to render to page.  Updated README.md
gemfile
merge conflicts
Merge branch 'develop'
gemfile update
Merge branch 'master' of github.com:Oneill38/nycdate
user_mailer
Merge branch 'develop'
Adding dynamic image tags for heroku
Changed production.rb
Precompiled Assets
Changes to CSS
CSS stylings not working now that I deployed to heroku and changed file extension to style.css.erb - WHY??
Made some changes to CSS
events.js - made an ajax call to the event api so the page didn't have to change
Working on rendering API data with ajax call
Ahhh, just trying to switch branches
Ajax call function for general events api call
Last ditch efforts to code and fix project
Last merge conflicts