updating grunt
merging changes