updated gitignore
working on index.js
fixed confilcts