finish up all JS code currently needed
fixing merge errors
Merge pull request #6 from cwnidog/add-javascript

finish up all JS code currently needed