Merge pull request #1 from evildmp/master

Merged update from evildmp:master
Added loacker name to the list
added my github name
merge loacker
Merge pull request #233 from lucaippo/amend-my-name

Amend my name
Merge branch 'master' of https://github.com/evildmp/afraid-to-commit
amend git conflicts
Update attendees_and_learners.rst
Merge pull request #234 from simodalla/add-my-name

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

merging upstream master on Github
added my github name
Merge pull request #236 from simodalla/amend-my-name

Amend my name
Merge remote-tracking branch 'upstream/master'