Bunix
diff --git a/‎gulpfile.js
+26-15 b/‎gulpfile.js
+26-15
diff --git a/‎resources/views/index.blade.php
+2-6 b/‎resources/views/index.blade.php
+2-6
diff --git a/‎tasks/concatScripts.task.js
+18 b/‎tasks/concatScripts.task.js
+18
@@ -1,4 +1,6 @@
 var elixir = require('laravel-elixir')
+
+require('./tasks/concatScripts.task.js');
 require('laravel-elixir-karma')
 require('./tasks/angular.task.js')
 require('./tasks/bower.task.js')
@@ -25,27 +27,36 @@ elixir(function (mix) {
   var fontsOutputFolder = config.fonts.outputFolder
   var buildPath = config.buildPath
 
-  var assets = [
-      jsOutputFolder + '/vendor.js',
-      jsOutputFolder + '/partials.js',
-      jsOutputFolder + '/app.js',
-      cssOutputFolder + '/vendor.css',
-      cssOutputFolder + '/app.css'
-    ],
-    karmaJsDir = [
-      jsOutputFolder + '/vendor.js',
-      'node_modules/angular-mocks/angular-mocks.js',
-      'node_modules/ng-describe/dist/ng-describe.js',
-      jsOutputFolder + '/partials.js',
-      jsOutputFolder + '/app.js',
-      'tests/angular/**/*.spec.js'
-  ]
+   var assets = [
+          'public/js/final.js',
+          'public/css/final.css'
+        ],
+        scripts = [
+          './public/js/vendor.js',
+          './public/js/partials.js',
+          './public/js/app.js',
+          './public/dist/js/app.js'
+        ],
+        styles = [
+          './public/css/vendor.css',
+          './public/css/app.css'
+        ],
+        karmaJsDir = [
+          jsOutputFolder + '/vendor.js',
+          'node_modules/angular-mocks/angular-mocks.js',
+          'node_modules/ng-describe/dist/ng-describe.js',
+          jsOutputFolder + '/partials.js',
+          jsOutputFolder + '/app.js',
+          'tests/angular/**/*.spec.js'
+        ];
 
   mix
     .bower()
     .angular('./angular/')
     .ngHtml2Js('./angular/**/*.html')
+    .concatScripts(scripts, 'final.js')
     .sass('./angular/**/*.scss', 'public/css')
+    .styles(styles, './public/css/final.css')
     .version(assets)
     .browserSync({
       proxy: 'localhost:8000'
 
@@ -4,8 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <link rel="stylesheet" href="{!! elixir('css/vendor.css') !!}">
-    <link rel="stylesheet" href="{!! elixir('css/app.css') !!}">
+    <link rel="stylesheet" href="{!! elixir('css/final.css') !!}">
     <link rel='stylesheet' type='text/css' href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic'>
     <!-- Font Awesome -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
@@ -22,11 +21,8 @@
 <body route-bodyclass>
     <div class="wrapper">
         <div ui-view="layout"></div>
-        <script src="{!! elixir('js/vendor.js') !!}"></script>
-        <script src="{!! elixir('js/partials.js') !!}"></script>
-        <script src="{!! elixir('js/app.js') !!}"></script>
         <div class="control-sidebar-bg"></div>
     </div>
-    <script src="dist/js/app.js"></script>
+    <script src="{!! elixir('js/final.js') !!}" async defer></script>
 </body>
 </html>
@@ -0,0 +1,18 @@
+var gulp = require('gulp');
+var concat = require('gulp-concat');
+
+var Elixir = require('laravel-elixir');
+
+var Task = Elixir.Task;
+
+Elixir.extend('concatScripts', function(scripts, dest) {
+
+    new Task('concat-scripts', function() {
+
+    return gulp.src(scripts)
+    .pipe(concat(dest))
+    .pipe(gulp.dest(Elixir.config.js.outputFolder));
+
+    }).watch(scripts);
+
+});