Initial commit
Updated package.json

Conflicts:
	package.json