commit by jayli
Merge branch 'master' of github.com:jayli/generator-clam

Conflicts:
	package.json