Fix typo
Merge remote-tracking branch 'rubyconf/master'

Conflicts:
	source/speakers.html.erb