From 16dcda71e546efcf2fda605df2b5092598b53a79 Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Wed, 24 Aug 2016 00:39:18 -0400
Subject: [PATCH 01/11] Client Footer Information

---
 include/client/footer.inc.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/include/client/footer.inc.php b/include/client/footer.inc.php
index 6c925d0c..c3b20980 100755
--- a/include/client/footer.inc.php
+++ b/include/client/footer.inc.php
@@ -7,35 +7,34 @@
         <div class="col-md-4">
             <h2> Reach Us </h2>
 
-            Company Name<br> 
-            221, 2nd floor <br>
-            Baker street, London, <br>
-            England
+Occoneechee Council - BSA<br> 
+            3231 Atlantic Avenue<br>
+            Raleigh, NC 27604
 
         </div>
         <div class="col-md-4">
             <h2> Important links </h2>
             <ul>
-                <li><a href="#">First link</a></li>
-                <li><a href="#">Second link</a></li>
-                <li><a href="#">Third link</a></li>
-                <li><a href="#">Fourth link</a></li>
+                <li><a href="https://lodge104.net">Main Site</a></li>
+                <li><a href="http://www.oa-bsa.org/">National Order of the Arrow</a></li>
+                <li><a href="http://www.southern.oa-bsa.org/">Southern Region</a></li>
+                <li><a href="http://www.sr7b.org/">Section SR-7B</a></li>
             </ul>
             
         </div>
         <div class="col-md-4">
             <h2> Contact US </h2>
 
-            <i class="icon-phone-sign"></i> 1800-9876-5432 <br>
-            <i class="icon-envelope"></i> mymail@company.com 
+            <i class="icon-phone-sign"></i> 1-800-662-7102 <br>
+            <i class="icon-envelope"></i> support@lodge104.net 
 
             <div class="social-icons">
                 <ul>
-                    <li> <a href="#"> <i class="icon-facebook"></i> </a> </li>
-                    <li> <a href="#"> <i class="icon-twitter"></i> </a> </li>
-                    <li> <a href="#"> <i class="icon-google-plus"></i> </a> </li>                        
-                    <li> <a href="#"> <i class="icon-linkedin"></i> </a> </li>
-                    <li> <a href="#"> <i class="icon-github"></i> </a> </li>
+                    <li> <a href="facebook.com/lodge104"> <i class="icon-facebook"></i> </a> </li>
+                    <li> <a href="twitter.com/lodge104"> <i class="icon-twitter"></i> </a> </li>
+                    <li> <a href="instagram.com/lodge104"> <i class="icon-instagram"></i> </a> </li>                        
+                    <li> <a href="youtube.com/oalodge104"> <i class="icon-youtube"></i> </a> </li>
+                    <li> <a href="snapchat.com/add/lodge104"> <i class="icon-snapchat"></i> </a> </li>
                 </ul>
             </div>            
 
@@ -46,7 +45,6 @@
     <div class="col-md-12">
         <div class="footer-content"> 
         <p>Copyright &copy; <?php echo date('Y'); ?> <?php echo (string) $ost->company ?: 'osTicket.com'; ?> - All rights reserved.</p>
-        <a id="poweredBy" href="http://osticket.com" target="_blank"><?php echo __('Helpdesk software - powered by osTicket'); ?></a>
         </div>
     </div>
 </div></div>

From 762e65d574cca06431987730e8097cf510b17e75 Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Wed, 24 Aug 2016 00:44:55 -0400
Subject: [PATCH 02/11] removed snapchat

---
 include/client/footer.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/client/footer.inc.php b/include/client/footer.inc.php
index c3b20980..00bb39dc 100755
--- a/include/client/footer.inc.php
+++ b/include/client/footer.inc.php
@@ -34,7 +34,6 @@
                     <li> <a href="twitter.com/lodge104"> <i class="icon-twitter"></i> </a> </li>
                     <li> <a href="instagram.com/lodge104"> <i class="icon-instagram"></i> </a> </li>                        
                     <li> <a href="youtube.com/oalodge104"> <i class="icon-youtube"></i> </a> </li>
-                    <li> <a href="snapchat.com/add/lodge104"> <i class="icon-snapchat"></i> </a> </li>
                 </ul>
             </div>            
 

From c81b57f2850b4f78870fe0c9df8dfa5c2d120df8 Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:29:41 -0400
Subject: [PATCH 03/11] GA

---
 include/client/footer.inc.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/client/footer.inc.php b/include/client/footer.inc.php
index b8bcd9e4..ef55a811 100755
--- a/include/client/footer.inc.php
+++ b/include/client/footer.inc.php
@@ -3,6 +3,16 @@
     <div id="footer">
 <div class="container"> <div class="row">
     <div class="fwidgets">
+            <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-37461006-10', 'auto');
+  ga('send', 'pageview');
+
+</script>
 
         <div class="col-md-4">
             <h2> Reach Us </h2>
@@ -34,10 +44,7 @@
                     <li> <a href="twitter.com/lodge104"> <i class="icon-twitter"></i> </a> </li>
                     <li> <a href="instagram.com/lodge104"> <i class="icon-instagram"></i> </a> </li>                        
                     <li> <a href="youtube.com/oalodge104"> <i class="icon-youtube"></i> </a> </li>
-<<<<<<< HEAD
-=======
                     <li> <a href="snapchat.com/add/lodge104"> <i class="icon-snapchat"></i> </a> </li>
->>>>>>> master
                 </ul>
             </div>            
 

From 2d44bae52f4c8a943e0c5ead792729e416fee5fa Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:31:01 -0400
Subject: [PATCH 04/11] GA

---
 open.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/open.php b/open.php
index 4f727f16..caa74dcb 100755
--- a/open.php
+++ b/open.php
@@ -1,3 +1,4 @@
+<?php include_once("analyticstracking.php") ?>
 <?php
 /*********************************************************************
     open.php

From 184d86eaada8376f1988ee60c8ffe97030f55cae Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:31:26 -0400
Subject: [PATCH 05/11] GA

---
 account.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/account.php b/account.php
index 3b0de2de..07d1d73e 100755
--- a/account.php
+++ b/account.php
@@ -1,3 +1,4 @@
+<?php include_once("analyticstracking.php") ?>
 <?php
 /*********************************************************************
     profile.php

From 5311a62ed79acd74852527013ad4fe44c09eec3b Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:31:55 -0400
Subject: [PATCH 06/11] GA

---
 file.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/file.php b/file.php
index 22cc8094..ffb0c692 100755
--- a/file.php
+++ b/file.php
@@ -1,3 +1,4 @@
+<?php include_once("analyticstracking.php") ?>
 <?php
 /*********************************************************************
     file.php

From b7406e0cf431010a00170e3a2e98c0ea1f57b9d0 Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:35:45 -0400
Subject: [PATCH 07/11] Update footer.inc.php

---
 include/client/footer.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/client/footer.inc.php b/include/client/footer.inc.php
index ef55a811..a5184f59 100755
--- a/include/client/footer.inc.php
+++ b/include/client/footer.inc.php
@@ -44,7 +44,7 @@
                     <li> <a href="twitter.com/lodge104"> <i class="icon-twitter"></i> </a> </li>
                     <li> <a href="instagram.com/lodge104"> <i class="icon-instagram"></i> </a> </li>                        
                     <li> <a href="youtube.com/oalodge104"> <i class="icon-youtube"></i> </a> </li>
-                    <li> <a href="snapchat.com/add/lodge104"> <i class="icon-snapchat"></i> </a> </li>
+//                    <li> <a href="snapchat.com/add/lodge104"> <i class="icon-snapchat"></i> </a> </li>
                 </ul>
             </div>            
 

From ca1710399d02c30f7e45f7bc874cb81d15e3acec Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:36:48 -0400
Subject: [PATCH 08/11] Update footer.inc.php

---
 include/client/footer.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/client/footer.inc.php b/include/client/footer.inc.php
index a5184f59..1cd414d3 100755
--- a/include/client/footer.inc.php
+++ b/include/client/footer.inc.php
@@ -44,7 +44,7 @@
                     <li> <a href="twitter.com/lodge104"> <i class="icon-twitter"></i> </a> </li>
                     <li> <a href="instagram.com/lodge104"> <i class="icon-instagram"></i> </a> </li>                        
                     <li> <a href="youtube.com/oalodge104"> <i class="icon-youtube"></i> </a> </li>
-//                    <li> <a href="snapchat.com/add/lodge104"> <i class="icon-snapchat"></i> </a> </li>
+                 // <li> <a href="snapchat.com/add/lodge104"> <i class="icon-snapchat"></i> </a> </li>
                 </ul>
             </div>            
 

From 91465e7a1d38fdab4945d76ccd0106ee6348c84b Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:38:13 -0400
Subject: [PATCH 09/11] Update account.php

---
 account.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/account.php b/account.php
index 07d1d73e..3b0de2de 100755
--- a/account.php
+++ b/account.php
@@ -1,4 +1,3 @@
-<?php include_once("analyticstracking.php") ?>
 <?php
 /*********************************************************************
     profile.php

From ed4e7dc3269e994420545aee6ee16e7391fecb25 Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:38:31 -0400
Subject: [PATCH 10/11] Update file.php

---
 file.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/file.php b/file.php
index ffb0c692..22cc8094 100755
--- a/file.php
+++ b/file.php
@@ -1,4 +1,3 @@
-<?php include_once("analyticstracking.php") ?>
 <?php
 /*********************************************************************
     file.php

From 433ddac013930f2cb7e904b8b925beea999674c5 Mon Sep 17 00:00:00 2001
From: Nicholas Anderson <nickanderson1998@gmail.com>
Date: Fri, 26 Aug 2016 15:38:49 -0400
Subject: [PATCH 11/11] Update open.php

---
 open.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/open.php b/open.php
index caa74dcb..4f727f16 100755
--- a/open.php
+++ b/open.php
@@ -1,4 +1,3 @@
-<?php include_once("analyticstracking.php") ?>
 <?php
 /*********************************************************************
     open.php