edited html and js
Merge pull request #18 from shawnlknight/master

edited html and js