Updated package info

Conflicts:
	package.json