Add episode 36
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/render/2014/12/what-you-need-to-know-about-the-internet-of-things-with-josh-holmes/index.html.md