Update attendees_and_learners.rst

added to attendies
Update attendees_and_learners.rst

added my name
Update attendees_and_learners.rst

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

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

merge my pull request back into master
Merge pull request #1 from evildmp/master

update
Merge pull request #1 from evildmp/master

merging upstream master on GitHub
Merge pull request #1 from evildmp/master

getting changes
Merge pull request #2 from evildmp/master

merging upstream master
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Merge pull request #2 from evildmp/master

merging other people's changes
added Nadja's github username
fixed merge conflict