add package.json
add .gitignore
Merge branch 'work'