fix conflict in Gruntfile.js
Merge pull request #1 from maiis/master

Fix a conflit in Gruntfile.js