Merge pull request #32 from mayhewinator/WorkingBranch

Updates for splash screen, menu items and implemented some of the new help menu items

1 files changed, 10 insertions, 5 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 158bcaff..c8625159 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -259,6 +259,11 @@
                 "name": "NewFileWorkflowController"
             },
 
+            "mainMenuController": {
+                "module": "js/controllers/main-menu-controller",
+                "name": "MainMenuController"
+            },
+
             "owner": {
                 "module": "js/ninja.reel",
                 "name": "Ninja",
@@ -280,10 +285,10 @@
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
                     "documentBar":          {"@": "documentBar"},
-                    "timeline":             {"@": "timeline"}
+                    "timeline":             {"@": "timeline"},
+                    "mainMenuController":   {"@": "mainMenuController"}
                 }
             }
-
         }
     </script>
 
@@ -345,9 +350,9 @@
                         </section>
 
                         <section id="timelineResizer" class="timelineResizer resizeBar"></section>
-                        <section id="breadCrumbTrail">
-                                                        <div id="breadCrumbComponent"></div>
-                                                    </section>
+                            <section id="breadCrumbTrail">
+                                <div id="breadCrumbComponent"></div>
+                            </section>
                         <section id="bottomPanelContainer" class="panelContainer">
                             <section id="timelinePanel" class="panel">
                                 <div id="timelinePanelComponent"></div>