Merge pull request #1 from evildmp/master

update attendees
Merge pull request #83 from ernestorx/master

Merge pull request #1 from evildmp/master