Episode 16. Shining Ray.
Update Shownote of 5/20
Episode 17.
New Episode: Databases with Eric Redmond
Merge branch 'master' of github.com:pragmaticly/teahour.fm

Conflicts:
	data/author.yml
Episode 19.
Episode 20.
typo.
Episode #21: 天使湾和天使投资
New Ep with kgen
kgen avatar url
Update 2013-07-09-gfw-and-vpncloud.html.markdown
Merge pull request #7 from kaku87/patch-1

Update 2013-07-09-gfw-and-vpncloud.html.markdown

谢谢 @kaku87！
#22 号外 with kgen
Episode 24 with lilu.
Add SICP to shownote.
Update 2013-07-09-gfw-and-vpncloud.html.markdown

Change URL of VPNCloud to https.
Add more resources.
Merge pull request #8 from kgen/update_vpncloud

Update 2013-07-09-gfw-and-vpncloud.html.markdown
Update 2013-07-12-startup-discussion-with-kgen.html.markdown

Change VPNCloud URL to https.
Merge pull request #9 from kgen/update_vpncloud

Update 2013-07-12-startup-discussion-with-kgen.html.markdown