added my name
Merge branch 'master' of github.com:averymanderson/teaching-git

Conflicts:
	attendees.txt