Update attendees_and_learners.rst
added myself to attendees.
Added more details about me.
Fixed conflict.
Fixed conflict.
still more