Merge pull request #36 from ibr/master

Using composer version of Markdown

composer.json

@@ -1,5 +1,6 @@
 {
     "require": {
-        "twig/twig": "1.12.*"
+        "twig/twig": "1.12.*",
+	"michelf/php-markdown": "1.3"
     }
-}
+}

index.php

@@ -9,8 +9,5 @@ define('THEMES_DIR', ROOT_DIR .'themes/');
 define('CACHE_DIR', LIB_DIR .'cache/');
 
 require(ROOT_DIR .'vendor/autoload.php');
-require(LIB_DIR .'markdown.php');
 require(LIB_DIR .'pico.php');
 $pico = new Pico();
-
-?>

lib/pico.php

@@ -1,5 +1,5 @@
 <?php
-
+use \Michelf\MarkdownExtra;
 /**
  * Pico
  *
@@ -132,7 +132,7 @@ class Pico {
 	{
 		$content = preg_replace('#/\*.+?\*/#s', '', $content); // Remove comments and meta
 		$content = str_replace('%base_url%', $this->base_url(), $content);
-		$content = Markdown($content);
+		$content = MarkdownExtra::defaultTransform($content);
 
 		return $content;
 	}