Adding my name
added my name
Merge pull request #1 from evildmp/master

merge joseph
modified name
Merge branch 'master' into add-my-name

Conflicts:
	attendees_and_learners.rst
Merge pull request #2 from evildmp/master

update again
Merge pull request #3 from evildmp/master

update again
Merge branch 'master' into add-my-name

Conflicts:
	attendees_and_learners.rst
Merge remote-tracking branch 'upstream/master'
adding my name to attendees list
Merge branch 'master' into add-my-name
Merge branch 'add-my-name' of https://github.com/chriscauley/afraid-to-commit

Conflicts:
	attendees_and_learners.rst
Merge branch 'master' of github.com:evildmp/afraid-to-commit

Conflicts:
	attendees_and_learners.rst
Merge branch 'add-my-name' of https://github.com/joelarson/afraid-to-commit

Conflicts:
	attendees_and_learners.rst
Merge branch 'addmyname' of https://github.com/jeffkile/afraid-to-commit

Conflicts:
	attendees_and_learners.rst