update
update .gitignore
Merge branch 'master' of github.com:Michieljoris/denodify

Conflicts:
	package.json