Merge pull request #58 from COPPER-BOBCAT/staging

Switched static file serving back to ../../client.
syntax highlighting
Merge pull request #60 from zindlerb/master

Syntax highlighting and css