Update attendees_and_learners.rst
Added matbrunt to attendee list
Update attendees_and_learners.rst
Added Tim to list of attendees
Merge branch 'add-my-name' of https://github.com/helenst/afraid-to-commit

Conflicts:
	attendees_and_learners.rst
Merge branch 'add-my-name' of https://github.com/amney/afraid-to-commit
Merge branch 'matbrunt' of https://github.com/matbrunt/afraid-to-commit
Merge branch 'master' of https://github.com/Mouldling/afraid-to-commit
Merge pull request #1 from evildmp/master

Merging upstream master on Github