Added a dependency on grunt to the package.json
Merged conflicts