Merge pull request #1 from evildmp/master

merge upstream
Added email address attendees_and_learners.rst.
Update attendees_and_learners.rst

updated the email with: at
resolve merge conflict adding attendee
Merge pull request #2 from evildmp/master

merging upstream master on Github