updated gitignore and added inital package.json
merge conflict