Merge branch 'master' into addmyname

Conflicts:
	attendees_and_learners.rst
Merge pull request #246 from kevindaum/addmyname

Update attendees_and_learners.rst