Update attendees_and_learners.rst
Adding my name
added my name
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst
added my name
Update attendees with my name.
Merge pull request #1 from evildmp/master

merge from him back
Merge pull request #1 from evildmp/master

merge joseph
Merge pull request #1 from evildmp/master

first pull from evildmp master
Merge pull request #1 from evildmp/master

Getting my fork up-to-date
Merge pull request #1 from evildmp/master

Updating history
Merge pull request #1 from evildmp/master

Updating..
Resolve conflict from upstream master
fix conflict
Merge pull request #248 from patrickbeeson/master

Update attendees with my name
amended my name with email and github account
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