including gruntfile.js
Fixing merge conflicts
Merge branch 'thechunsik-includeGrunt'