restructured package.json
Merge branch 'master' of github.com:kentandersen/make

Conflicts:
	package.json