Merge pull request #1 from evildmp/master

Merging latest upstream
Added my twitter handle and github URL
Merge remote-tracking branch 'upstream/master' into amendmyname

Conflicts:
	attendees_and_learners.rst
resolve merge conflict adding attendee