Create java.java
Update resources/languages.json
Update resources/languages.json
Merge pull request #145 from dragonwasrobot/master

Added Java Support
Merge branch 'force-ext' of github.com:MaxPower15/docco into ext-cleanup
Cleanup submission from @MaxPower15, that adds support for specifying the file type of the inputs based on a given extension other than the one the file has on disk.
Missing README update for -e flag.
Merge branch 'ext-cleanup'
Merge branch 'scala_support' of github.com:marioaquino/docco into scala

Conflicts:
	resources/languages.json
Merge branch 'scala'
switching from showdown to marked
Making Docco a literate CoffeeScript file
nicer formatting for language list
Docco can now handle literate CoffeeScript, as well as literate anything-else, with the .codeext.md convention
removing silly resolvesources function. Unix does that.
progres...
... fixed the jump menu
Docco 0.5.0
Docco 0.5.0 tweaks
Removing pagelet, and test suite. Not quick-and-dirty enough.