modify gruntfile
Merge branch 'master' of github.com:mycolorway/simple-template

Conflicts:
	Gruntfile.coffee