Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst

added my name
Add myself to the attendees list
Update attendees_and_learners.rst
Added my name to the attendees
Added my name.
First My commit on django conf
Update attendees_and_learners.rst
Merge pull request #1 from evildmp/master

updating the master branch
Resolved merge conflict.
fixed french word for island
Merge branch 'add-my-name' of github.com:julianobinder/afraid-to-commit into merges

Conflicts:
	attendees_and_learners.rst
Merge branch 'add-my-name' of github.com:providenz/afraid-to-commit into merges

Conflicts:
	attendees_and_learners.rst
added my github account
Merge branch 'add-my-name' of https://github.com/gtvblame/afraid-to-commit into merges

Conflicts:
	attendees_and_learners.rst
Merge branch 'add-my-name' of https://github.com/m2w/afraid-to-commit into merges

Conflicts:
	attendees_and_learners.rst
Merge branch 'add-my-name' of https://github.com/niclas-ahden/afraid-to-commit into merges
Merge branch 'add-my-name' of https://github.com/mcgohier/afraid-to-commit into merges

Conflicts:
	attendees_and_learners.rst