Merge branch 'master' into 'branch_conflict'

# Conflicts:
#   README.md

README.md

@@ -6,9 +6,11 @@ to make a nice readme file for other users explaining the content of the
 repository which includes
 
 1. ordered lists
-2. unordered lists
-3. links
-4. tables
+2. unordered lists, for example
+   - one item
+   - second item
+3. links, either just by writing http://myurl.com or [Linktext](http://myurl.com)
+4. tables, see below
 
 and so forth. Markdown is designed to look as readable as possible also in text
 editors and for basic things it's very easy to use: