Merge pull request #1 from evildmp/master

merging upstream master on GitHub
added my github name
Merge branch 'new-branch-name' of github.com:jdimiceli/afraid-to-commit into mergejenny

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