From 50d60b380b13ef2f3f4ec0baac7c6a1864937eff Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel.ebert@upf.edu>
Date: Mon, 16 Apr 2012 14:51:29 +0200
Subject: [PATCH] Updated Readme from master

---
 CHANGELOG.md | 25 +++++++++++++++++++++++++
 index.html   | 28 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..ac4fbd57
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+Changelog
+=========
+
+0.1.1
+-----
+
+* Removed unnecessary print commands
+* Created the documentation
+
+0.1.0
+-----
+
+* Supports encrypted journals using AES encryption
+* Support external editors for composing entries
+
+0.0.2
+-----
+
+* Filtering by tags and dates
+* Now using dedicated classes for Journals and entries
+
+0.0.1
+-----
+
+* Composing entries works. That's pretty much it.
\ No newline at end of file
diff --git a/index.html b/index.html
index 49a1876b..a0f22cc9 100644
--- a/index.html
+++ b/index.html
@@ -216,6 +216,34 @@ python setup.py install
 
 <pre><code>jrnl -json
 </code></pre>
+<h1>Changelog</h1>
+
+<h2>0.1.1</h2>
+
+<ul>
+<li>Removed unnecessary print commands</li>
+<li>Created the documentation</li>
+</ul>
+
+<h2>0.1.0</h2>
+
+<ul>
+<li>Supports encrypted journals using AES encryption</li>
+<li>Support external editors for composing entries</li>
+</ul>
+
+<h2>0.0.2</h2>
+
+<ul>
+<li>Filtering by tags and dates</li>
+<li>Now using dedicated classes for Journals and entries</li>
+</ul>
+
+<h2>0.0.1</h2>
+
+<ul>
+<li>Composing entries works. That's pretty much it.</li>
+</ul>
 
         </div> <!-- /span10 -->