Merge branch 'master' into develop
changed static server to express
Merge pull request #4 from flipside/develop

Develop
Merge branch 'develop' of https://github.com/interactivedocs/fluency into develop
Merge branch 'develop'