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

Updating..
Resolve conflict from upstream master
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
removed name from master.
Adding my name.
update name with twitter and github refs.
Added my name & email in attendees_and_learners.rst
update from upstream
Fixing things up.
Merge branch 'addmyname' of https://github.com/kevindaum/afraid-to-commit into mergestuff

Conflicts:
	attendees_and_learners.rst
Merge pull request #250 from shahv/fixup

Fixup
Merge github.com:evildmp/afraid-to-commit into mergestuff
Merge pull request #252 from patrickbeeson/master

Update my name with twitter and github info
Merge branch 'new_branch' of https://github.com/LC9/afraid-to-commit into mergestuff

Conflicts:
	attendees_and_learners.rst
Merging from original.