Merge pull request #10 from feg-stuttgart/beta

Update js.html
Merge pull request #11 from feg-stuttgart/master

Merge pull request #10 from feg-stuttgart/beta