Merge pull request #5 from trewto/master

Update javascript and CSS