Adding my name to the attendees list
Merge pull request #261 from stevenewey/addmyname

Adding my name to the attendees list
Merge pull request #1 from evildmp/master

Merging latest upstream