Merge branch 'master' into gh-pages

Pull request #1 from maddes/patch-1 was already fixed on gh-pages.
master branch was deleted from GH since all the development should
now occur on gh-pages.

--------------------------------------------------------------------------
Commit: e6c7ec51733d1c7497624c4a75a2c38ea6beae13 [e6c7ec5]
Parents: 83e0a4e15a, 119513fe98
Author: the-happy-hippo <th3hh0@gmail.com>
Date: Wednesday, May 07, 2014 2:31:52 PM
Labels: master
Merge pull request #1 from maddes/patch-1

Replaced bullet code with unicode character...