install package.json and create gitignore
Merge branches