update Gruntfile.js
Merge branch 'master' of https://github.com/jansanchez/html6
iconflict
build