Added twot
Merge branch 'edit' of github.com:StommePoes/afraid-to-commit

Conflicts:
	attendees_and_learners.rst
Merge branch 'master' of github.com:evildmp/afraid-to-commit