Fixed gitignore
Reformatted package.json
Fixed merging conflicts