Merge branch 'master' into develop

.travis.yml

@@ -7,7 +7,7 @@ before_install:
   - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
   - npm install -g npm@latest
 
-#travis build speed up
+#travis build  speed up
 sudo: false
 cache:
   directories:

CREDITS.md

@@ -1,8 +1,8 @@
 Credits
 =======
   - Showdown v2
-    * [Estevão Santos](http://soares-dos-santos.com)<br/>
-      Code Refactoring and project maintainer
+    * [Estevão Santos](http://soares-dos-santos.com)
+    * [Pascal Deschênes](https://github.com/pdeschen)
 
   - Showdown v1
     * [Corey Innis](http://github.com/coreyti):<br/>