Merge pull request #1 from evildmp/master

update attendees