Merge pull request #1 from evildmp/master

merging upstream master on github
added my github name
added my github name, again
added my name
updated date
Merge pull request #1 from evildmp/master

merging from upstream
Added date again after pulling in upstream changes
Added date again after pulling in upstream changes
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Merge pull request #182 from BobAalsma/add-my-name

Update attendees_and_learners.rst
Merge pull request #177 from ktam33/amend-my-name

Amended my name
merge LeMeteore
merge LeMeteore
Merge branch 'master' of github.com:evildmp/afraid-to-commit into LeMeteore-amend-my-name
Merge branch 'add-by-batisteo' of github.com:batisteo/afraid-to-commit into batisteo

Conflicts:
	attendees_and_learners.rst
Getting ready for Dutch Django Sprint
Merge pull request #1 from evildmp/master

Merge changes before workshop 22-02 A'dam