Update attendees_and_learners.rst
Merge pull request #1 from evildmp/master

Getting my fork up-to-date
Merge pull request #248 from patrickbeeson/master

Update attendees with my name
Merge branch 'master' of https://github.com/shahv/afraid-to-commit into mergestuff

Conflicts:
	attendees_and_learners.rst
Merge https://github.com/kevindaum/afraid-to-commit into mergestuff
update from upstream