Add package.json
Merge branch 'master' of github.com:laoshanlung/evil

Conflicts:
	.gitignore