Gruntfile updated
Merging code
Merging code