Merge pull request #1 from evildmp/master

Merge changes before workshop 22-02 A'dam
I added my name
Update README.txt
added me name, wot?
Update attendees_and_learners.rst

Added my name to the list of attendees
newline?
Update attendees_and_learners.rst

Let's get started with this interesting workshop ... Django Sprint 2014 Amsterdam
ah sphoinx
Update attendees_and_learners.rst
update readme

nonsense
added my name
removed nonsense
added my name
Update attendees_and_learners.rst

Added my name to the right event this time :)
Merge branch 'master' of github.com:Oxylo/afraid-to-commit

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

Conflicts:
	attendees_and_learners.rst
Merge github.com:henkvos/afraid-to-commit

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

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

Conflicts:
	attendees_and_learners.rst