Merge pull request #260 from avenet/add-my-name

Adding my name to the attendees list
update contributors & attendees
Adding my name to the attendees list
Update attendees_and_learners.rst

I added my name
Update attendees_and_learners.rst

Add Craig Barnes
added Gary to attendees_and_learners
Update attendees_and_learners.rst

Added name to UK PyCon 2014 list.
Update attendees_and_learners.rst
Merge pull request #261 from stevenewey/addmyname

Adding my name to the attendees list
Update attendees_and_learners.rst

Fix missing whitespace
Add Davide Ceretti to attendees and learners
Merge pull request #265 from cjbarnes18/craig

Update attendees_and_learners.rst
add attendees (merge)
merged
merged
resolve merge conflict adding attendee
resolve merge conflict adding attendee
resolve merge conflict adding attendee
Merge pull request #1 from evildmp/master

update repo
Merge pull request #2 from cdcf/master

update repo