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

getting changes
added my github name (mod)
Merge pull request #2 from evildmp/master

merge upstream to my master branch
added my name
added my github name
Merge remote-tracking branch 'upstream/master' into afraid-viniciusmayer
added my github name (mod2)
merging
Merge remote-tracking branch 'upstream/master' into pyconie2014
made minor changes
Merge branch 'pyconie2014' of https://github.com/paulogrady/afraid-to-commit into various_merges
merge Brendan
Merge branch 'add-my-name' of https://github.com/iamstephenkerr/afraid-to-commit into various_merges
merge Wayne
merge viniciusmayer
Merge remote-tracking branch 'upstream/master'