update
Merge branch 'master' of https://github.com/jschaul/talkshow
added gitignore