Javascript done
Commited
Refactored Javascript
Conflicts resolved
Merge pull request #34 from sjafri5/parthnaik_refactored_js

Parthnaik refactored js