new post
Merge branch 'master' of github.com:humitos/blog

Conflicts:
	nikola/posts/nikola/servidor-de-medios-para-smarttv.rst