Minor modification
Fix formatting
Merge branch 'master' of https://github.com/evildmp/afraid-to-commit into evildmp-master

Conflicts:
	attendees_and_learners.rst
Merge remote-tracking branch 'upstream/master'