Merge pull request #4 from KackieM/master

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

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

html updates
edit html form
js edit
Merge pull request #7 from shawnlknight/master

edit html form
Merge pull request #8 from KackieM/master

commit new data js
Merge pull request #10 from andrewraynal/master

js edit
group work commit test shipping