Merge pull request #1 from evildmp/master

updating the master branch
fixed french word for island
added my github account
Merge branch 'typofix' of https://github.com/providenz/afraid-to-commit into merges
Merge branch 'amend-my-name' of https://github.com/sabinem/afraid-to-commit into merges

Conflicts:
	attendees_and_learners.rst