Update attendees_and_learners.rst
fix conflict
fix conflict
Merge branch 'addmyname' of https://github.com/oromero/afraid-to-commit

Conflicts:
	attendees_and_learners.rst