episode 28.
Merge branch 'master' of github.com:pragmaticly/teahour.fm

Conflicts:
	data/author.yml