updates
javascript
javascrip updates woo
resolve merge conflicts
Merge pull request #14 from hoylejanae/javascript_updates

Javascript updates, fixed merge conflicts