Merge pull request #10 from Stijn-Flipper/html-syntax

also provide html syntax highlighting
Merge pull request #12 from Stijn-Flipper/master

updated README
fixes problem with highlighting
Merge pull request #14 from kris89/master

fixes problem with highlighting
Merge pull request #1 from evidens/master

Update from upstream master