sacoffolded
Merge branch 'master' of github.com:fmammoli/crop-node

Conflicts:
	.gitignore