Merge pull request #5 from trewto/master

Update javascript and CSS
Merge pull request #6 from trewto/developer

Merge pull request #5 from trewto/master