update attendees
Merge pull request #1 from evildmp/master

merging master
Merge pull request #194 from bjvanderweij/master

update attendees