added name

Added my name to the attendees list.
resolve merge conflict adding attendee