init
Merge branch 'master' of github.com:ishaba/grunt

Conflicts:
	README.md