Update attendees_and_learners.rst
Merge pull request #1 from evildmp/master

merge my pull request back into master
Update attendees_and_learners.rst
Merge pull request #2 from evildmp/master

merging other people's changes
added Nadja's github username
Added parens around brianmcdonnell's github account.
Merge pull request #1 from evildmp/master

Merge Upstream master on github
added my github name
merged Brian
Merge branch 'amend-my-name' of https://github.com/labhra/afraid-to-commit into mergebrian
Merge branch 'amend-my-name' of https://github.com/machinelady/afraid-to-commit into mergebrian
merge Brendan
Merge pull request #321 from evildmp/various_merges

Various merges
Merge pull request #2 from evildmp/master

downstream