Merge pull request #3 from andrewraynal/master

js edit
pushing first data js commit
Merge pull request #4 from KackieM/master

pushing first data js commit
second commit scaled down
html updates
Merge pull request #5 from KackieM/master

second commit scaled down
Merge pull request #6 from shawnlknight/master

html updates
js edit