Initial commit
package.json is created
add .gitignore
remove .idea
resolve conflicts