Merge remote-tracking branch 'upstream/master'

Resolve minor editing 2.6-to-2.7 editing conflict in bb.sh

1 files changed, 7 insertions, 1 deletions

diff --git a/README.md b/README.md
index 0c22047..8a5e362 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,14 @@ I created it because I wanted a very, very simple way to post entries to a blog
 
 *How simple? Just type `./bb.sh post` and start writing your blogpost.*
 
-You can see it live here: [read the initial blog post](https://web.archive.org/web/20130520204024/http://mmb.pcb.ub.es/~carlesfe/blog/creating-a-simple-blog-system-with-a-500-line-bash-script.html). That page was 100% generated using bashblog, no additional tweaking.
+[![asciinema](https://asciinema.org/a/4nr44km9ipow4s7u2w2eabeik.png)](https://asciinema.org/a/4nr44km9ipow4s7u2w2eabeik)
+
+You can see a sample here: [read the initial blog post](https://web.archive.org/web/20130520204024/http://mmb.pcb.ub.es/~carlesfe/blog/creating-a-simple-blog-system-with-a-500-line-bash-script.html). That page was 100% generated using bashblog, no additional tweaking.
 
 [![demo](https://raw.githubusercontent.com/cfenollosa/bashblog/gh-pages/images/demo_thumb.png)](https://raw.githubusercontent.com/cfenollosa/bashblog/gh-pages/images/demo.png)
 
+Check out [other bashblog users](https://www.google.com/search?q=%22Generated+with+bashblog,+a+single+bash+script+to+easily+create+blogs+like+this+one%22)
+
 
 Usage
 -----
@@ -128,6 +132,8 @@ As a guideline, pull requests should:
 Changelog
 ---------
 
+- 2.7      Store post date on a comment in the html file (#96). 
+           On rebuild, the post date will be synchronised between comment date and file date, with precedence for comment date.
 - 2.6      Support for multiple authors, use a different `.config` for each one
 - 2.5      Massive code cleanup by Martijn Dekker<br/>
            'tags' command<br/>