Merge pull request #17 from penzance/develop

Develop
Merge branch 'develop'
HTML, static asset changes
Merge pull request #18 from penzance/html_update

Html update