diff --git a/BrianePresentation.pptx b/BrianePresentation.pptx
new file mode 100644
index 0000000..0e340e5
Binary files /dev/null and b/BrianePresentation.pptx differ
diff --git a/CleanSlateTemplate (2).potx b/CleanSlateTemplate (2).potx
new file mode 100644
index 0000000..a305dd7
Binary files /dev/null and b/CleanSlateTemplate (2).potx differ
diff --git a/js/app.js b/js/app.js
index 9096956..b15080f 100644
--- a/js/app.js
+++ b/js/app.js
@@ -167,12 +167,21 @@ angular.module("app", ["ngSanitize", "ui.router"])
             });
             OARC.init(true, 'bottom-right', 'neutral');
         };
+<<<<<<< HEAD
         $scope.progressBarStyle = function progressBarStyle() {
             return {
                 "min-width": "2em",
                 width: $scope.progressBar() + "%"
             };
         };
+=======
+        //$scope.progressBarStyle = function progressBarStyle() {
+            //return {
+                "min-width": "2em",
+                width: $scope.progressBar() + "%"
+          //  };
+       // };
+>>>>>>> parent of a71832a... Merge pull request #212 from codefordc/brianek-patch-13
         
         $scope.renderHtml = function(html_code)
         {