bla
c
bla
aye
Merge branch 'master' of https://github.com/jschaul/talkshow.git

Conflicts:
	talkshow.py
a