1 files changed, 15 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 26209b1..0cb7d9c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -63,6 +63,16 @@ module.exports = function (grunt) {
         }
       }
     },
+    imagemin: {
+      dist: {
+        files: [{
+          expand: true,
+          cwd: 'img/',
+          src: '**/*.{png,jpg,gif}',
+          dest: 'dist/img/'
+        }]
+      }
+    },
     copy: {
       dist: {
         files: [{
@@ -85,7 +95,12 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-htmlmin');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
+  grunt.loadNpmTasks('grunt-contrib-imagemin');
   grunt.loadNpmTasks('grunt-contrib-copy');
 
+<<<<<<< HEAD
   grunt.registerTask('default', ['swig', 'htmlmin', 'cssmin', 'uglify', 'copy']);
+=======
+  grunt.registerTask('default', ['mkdir', 'swig', 'htmlmin', 'cssmin', 'uglify', 'imagemin', 'copy']);
+>>>>>>> parent of 90e6b7b... Remove grunt-contrib-imagemin image minification
 };