resolving conflicts
updating Gruntfile
removing npm-shrinkwrap
Merge pull request #197 from pdehaan/grunt-take2

Adding Grunt tasks