Update attendees_and_learners.rst

added my name
Merge pull request #238 from joetheone/add-my-name

Update attendees_and_learners.rst
fix conflict