Change output filename to include original extension
Added OpenGL Shading Language(GLSL) to the language list
Added scrolling support for the jump menu
Add ".cson" to languages
Added .ls livescript
Merge pull request #278 from homam/patch-1

Added .ls livescript
Merge pull request #274 from janraasch/patch-1

Add ".cson" to languages
Revert "Add ".cson" to languages"

This reverts commit cc016a06b18283788adb3662b21e855fd38a4b06.
Revert "Revert "Add ".cson" to languages""

This reverts commit 7fe2539d761bfc955f6d51e06d52b121d7dd26f0.
Merge pull request #271 from lcavadas/menu_scroll

Added scrolling support for the jump menu
Merge pull request #256 from ssorallen/master

Correct meta viewport content syntax
Handle case where no sections are available
Merge pull request #266 from mbuettner/master

Use first heading even if there is a line of code first
Merge pull request #191 from eins78/template-plain-markdown

add layout: plain-markdown
Deleted .geom extension from the supported language list as it may conflict with other languages
Merge pull request #203 from graysonwright/extensions

Change output filename to include original extension
Merge pull request #241 from aarbelaiz/add-glsl-support

Added OpenGL Shading Language(GLSL) to the language list
Sort languages.json alphabetically for clarity
Merge pull request #280 from shadowhand/sort-languages

Sort languages.json alphabetically for clarity
Merge remote-tracking branch 'remotes/jashkenas-original/master'

Conflicts:
	docco.js
	docco.litcoffee
	resources/languages.json
	resources/parallel/docco.jst