index and js
Merge branch 'master' into adam-basic-js

first js and html
Merge pull request #3 from FilWisher/adam-basic-js

Adam basic js