added my name (sorry for the conflict)
Merge remote-tracking branch 'juan/add-my-name'

Conflicts:
	attendees_and_learners.rst