add one post
Merge branch 'master' into gh-pages

Conflicts:
	src/posts/2014/06/afternoon.rst
Publication 04 Jun 2014 18:51:31