first commit
commit package.json
Merge branch 'master' of https://github.com/fariaserick/zombieTest

Conflicts:
	package.json