Added my name
Add my name to attendees list.
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Fixed year

2013 - 2014
Merge pull request #299 from machinelady/add-name

Added my name
Merge pull request #1 from evildmp/master

Pull from master
Merged in Nadja change
Merge my name in after Nadja
removed HEAD
Merge pull request #300 from andrewmccarthy/addAndrew

Add my name to attendees list.
Merge pull request #305 from mcgeeco/master

Conor added
Merge branch 'master' of https://github.com/evildmp/afraid-to-commit

Conflicts:
	attendees_and_learners.rst