Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst

Added Waldek Herka to the list of contributors
Update attendees_and_learners.rst
Merge pull request #1 from evildmp/master

Merging latest upstream
added name

Added my name to the attendees list.
resolve merge conflict adding attendee
resolve merge conflict adding attendee
resolve merge conflict adding attendee
resolve merge conflict adding attendee
resolve merge conflict adding attendee
Update attendees_and_learners.rst
Added my twitter handle and github URL
Update attendees_and_learners.rst
Merge remote-tracking branch 'upstream/master' into amendmyname

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

merge upstream
resolve merge conflict adding attendee
resolve merge conflict adding attendee