heroku push
fixing merge conflicts
adding rsvp widget