amended unmergeable-branch
Update attendees_and_learners.rst
Add my name to attendees list.
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
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Fixed year

2013 - 2014
Merge pull request #1 from evildmp/master

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

Pull from master
Merge pull request #1 from evildmp/master

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

update
Merged in Nadja change