Merge branch 'develop' into Evan

1 files changed, 6 insertions, 2 deletions

diff --git a/client/js/app.js b/client/js/app.js
index e2d5b9b..1602e65 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -13,12 +13,16 @@ mainApp.config(['$routeProvider', function($routeProvider){
         
         $routeProvider.
                 when('/home',{
-                    templateUrl: 'partials/home/main.html',
+                    templateUrl: 'partials/home/home.html',
                     controller: 'homeCtrl'
         }).
                 when('/network',{
-                    templateUrl: 'partials/network/main.html',
+                    templateUrl: 'partials/network/network.html',
                     controller: 'networkCtrl'
+		}).
+		        when('/image',{
+                    templateUrl: 'partials/image/image.html',
+                    controller: 'imageCtrl'
         }).otherwise({
             redirectTo: '/home'
         });