Update attendees with my name.
Resolve conflict from upstream master
Merge pull request #248 from patrickbeeson/master

Update attendees with my name