dependencies update
add IDE folder to gitignore
resolve merge conflict with package.json