とりあえずpackage.json
Merge branch 'master' of github.com:cancer/SavageApp

Conflicts:
	package.json