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

merging with upstream
Merge pull request #1 from evildmp/master

update attendees
added name via terminal
Merge pull request #2 from evildmp/master

merging with upstream
amend my name
merged jason
Merge pull request #83 from ernestorx/master

Merge pull request #1 from evildmp/master
fix merge conflict
Merge pull request #85 from davideire/amend-my-name

Amend my name
Merge remote-tracking branch 'upstream/master'