grunt init custom
Merge branch 'master' of github.com:chunterg/grunt-init-custom

Conflicts:
	README.md
	template.js