Merge pull request #6 from redpelicans/grunt

Grunt