Updated JS + Added gitignore
Merging