diff --git a/app/views/public/about_us.blade.php b/app/views/public/about_us.blade.php
index f6552c2995d4..9ca196902b41 100644
--- a/app/views/public/about_us.blade.php
+++ b/app/views/public/about_us.blade.php
@@ -1,86 +1,90 @@
 @extends('public.header')
 
 @section('content')
-  <section class="hero3" data-speed="2" data-type="background">
-    <div class="container">
-      <div class="caption">
-       <h1>WHY INVOICE NINJA?
-       </h1>
-     </div>
-   </div>
- </section>
+  <section class="hero background hero3" data-speed="2" data-type="background">
+  <div class="caption-side"></div>
+  <div class="container">
+    <div class="row" style="margin:0;">
+      <div class="caption-wrap">
+        <div class="caption">
+          <h1>About <span style="color:#ecd816"> InvoiceNinja</span></h1>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
 
  <section class="about center">
   <div class="container">
     <div class="row">
       <div class="col-md-8 col-md-offset-2">
-        <h2>Open Source Platform</h2>
-        <p>Free yourself from online invoicing platforms with high monthly fees and limited functionality.  Being <a href="https://github.com/hillelcoren/invoice-ninja" target="_blank">open source</a> allows us fast app development, security audits by the open-course community, and we can keep it <strong>FREE!</strong></p>
+        <h2>What is Invoice Ninja?</h2>
+        <p>Invoice Ninja is a free, open-source solution for invoicing and billing customers. With Invoice Ninja, you can easily build and send beautiful invoices from any device that has access to the web. Your clients can print your invoices, download them as pdf files, and even pay you online from within the system. </p>
+          <p>Yeah, there are other tools that do similar things, but ours is easier to use, better looking, faster, more powerful, more secure and costs less. In fact, you can use Invoice Ninja 100% free of charge. <strong>Forever</strong>.</p>
       </div>
     </div>
   </div>
 </section>
 
-<section class="about white-bg">
+<section class="team white-bg center">
   <div class="container">
-    <div class="row">
-      <div class="col-md-5">
-        <div class="screendump">
-          <img src="images/about1.jpg">
-        </div>
-      </div>
-      <div class="col-md-7">
-        <h2>Live PDF Creation</h2>
-        <p><strong>Look professional from day #1.</strong> Select one of our beautiful invoice templates to suit your company identity, switch between designs in real time to preview invoices & email them to clients with one click. The live preview PDF function was designed for an efficient and hassle-free experience, and it’s awesome!
-        </p>
-      </div>
-    </div>
-  </div>
-</section>
-<section class="about">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-7">
-        <h2>Online Payments</h2>
-        <p><strong>Authorize.net, Beanstream, PayPal?</strong> InvoiceNinja supports the most popular online payment gateways! If you need help integrating a third party gateway we don’t yet support, please contact us!  We’re happy to help!  If you need assistance of want to learn more about online payment solutions, contact us!</p>
-      </div>
-      <div class="col-md-5">
-        <div class="screendump">
-          <img src="images/about2.jpg">
-        </div>
-      </div>
-    </div>
-  </div>
-</section>
-<!--
-<section class="about center white-bg">
-  <div class="container">
-    <div class="row">
+      <div class="row">
       <div class="col-md-8 col-md-offset-2">
-        <h2>Info about the company/story</h2>
-        <p>Donec id elit non mi porta gravida at eget metus.
-          Fusce dapibus, tellus ac cursus commodo, tortor mauris
-          condimentum nibh, ut fermentum massa justo sit amet
-          risus. Etiam porta sem malesuada magna mollis euismod.
-          Donec sed odio dui.</p>
-        </div>
-      </div>
-    </div>
-  </section>
-  -->
-  <section class="upper-footer">
-   <div class="container">
-    <div class="row">
-      <div class="col-md-3 center-block">
-        <a href="#">
-          <div class="cta">
-            <h2 onclick="return getStarted()">Invoice Now <span>+</span></h2>
+           <h2>Team Ninja</h2>
+        <p>Invoice Ninja is managed by a team of seasoned web workers. We’ve worked plenty with the other products out there, and we thought it was high time that a better, more powerful, lighter and less evil online invoicing tool became available. We launched in early 2014 and have been thrilled by the enthusiastic response we’ve received from our growing community of users.</p>
           </div>
-        </a>
+           </div>
+    <div class="row">
+      <div class="col-md-3">
+          <img src="images/shalomstark.jpg" alt="Shalom Stark" class="img-circle">
+          <h2>SHALOM STARK</h2>
+          <p class="blue-text">Co-Founder, CEO</p>
+          <p>Shalom has specialized in small business development for nearly 10 years.  In addition to InvoiceNinja.com Shalom is CEO of a leading tour agency in Israel.</p>
+          <p><span class="social"><a href="https://twitter.com/shalomstark" target="_blank"><img src="images/twitter.svg" alt="Twitter"></a></span>
+          <span class="social"><a href="https://twitter.com/shalomstark" target="_blank"><img src="images/linkedin.svg" alt="LinkedIn"></a></span>
+          </p>
+              <p class="blue-text" style="margin-bottom: 2px;"><a href="http://shalomisraeltours.com/">shalomisraeltours.com</a></p>
+          <p class="blue-text"><a href="http://shalomholytours.com/" target="_blank">shalomholytours.com</a></p>
       </div>
+    <div class="col-md-3">
+          <img src="images/hillelcoren.jpg" alt="Hillel Coren" class="img-circle">
+          <h2>HILLEL COREN</h2>
+          <p class="blue-text">Co-Founder, CTO</p>
+          <p>Hillel has been developing enterprise applications for nearly 15 years. His open-source <a href="http://www.adobe.com/cfusion/exchange/index.cfm?event=extensionDetail&extid=1721530">AutoComplete component</a> has been used by thousands of developers around the world.</p>
+          <p><span class="social"><a href="https://twitter.com/hillelcoren" target="_blank"><img src="images/twitter.svg" alt="Twitter"></a></span>
+          <span class="social"><a href="http://www.linkedin.com/profile/view?id=105143214" target="_blank"><img src="images/linkedin.svg" alt="LinkedIn"></a></span>
+          </p>
+          <p class="blue-text"><a href="http://hillelcoren.com/" target="_blank">hillelcoren.com</a></p>
+      </div>
+        
+        <div class="col-md-3">
+          <img src="images/razikantorp.jpg" alt="Razi Kantorp" class="img-circle">
+          <h2>RAZI KANTORP</h2>
+          <p class="blue-text">Designer</p>
+          <p>Razi is a pixel nerd with a great deal of experience in design for web sites and applications. When she isn't busy with InvoiceNinja she runs a small web agency in Stockholm called kantorp-wegl.in</p>
+          <p><span class="social"><a href="https://twitter.com/kantorpweglin" target="_blank"><img src="images/twitter.svg" alt="Twitter"></a></span>
+          <span class="social"><a href="http://www.linkedin.com/profile/view?id=105143214" target="_blank"><img src="images/linkedin.svg" alt="LinkedIn"></a></span>
+              <span class="social"><a href="http://instagram.com/kantorpweglin" target="_blank"><img src="images/instagram.svg" alt="Twitter"></a>
+          </p>
+          <p class="blue-text"><a href="http://kantorp-wegl.in/" target="_blank">kantorp-wegl.in</a></p>
+      </div>
+         <div class="col-md-3">
+          <img src="images/benjacobson.jpg" alt="Ben Jacobsen" class="img-circle">
+          <h2>BEN JACOBSON</h2>
+          <p class="blue-text">Marketing</p>
+          <p>A veteran digital marketer and content strategist, Ben specializes in building communities around brands that make business easier for freelancers, SMBs and micro-entrepreneurs. Ben issues electronic invoices like they were free. 
+</p>
+          <p><span class="social"><a href="https://twitter.com/osbennn" target="_blank"><img src="images/twitter.svg" alt="Twitter"></a></span>
+          <span class="social"><a href="https://www.linkedin.com/pub/razi-kantorp/35/368/973" target="_blank"><img src="images/linkedin.svg" alt="LinkedIn"></a></span>
+               <span class="social"><a href="http://about.me/osbennn" target="_blank"><img src="images/me.svg" alt="about.me"></a></span>
+          </p>
+          <p class="blue-text"><a href="http://actionpackedmedia.com/" target="_blank">actionpackedmedia.com</a></p>
+      </div>
+      
     </div>
   </div>
 </section>
 
 
+
 @stop
\ No newline at end of file
diff --git a/public/css/splash.css b/public/css/splash.css
index 81f2ecef302d..210059e6540c 100644
--- a/public/css/splash.css
+++ b/public/css/splash.css
@@ -289,15 +289,20 @@ section.blue .col-md-6 h1 span {
     text-transform: lowercase;
 }
 
-section.about {
+section.about, section.team {
     padding: 70px 0;
 }
 
-section.about h2 {
-    margin: 0 0 25px;
+section.about h2, section.team h2 {
     font-size: 25px;
+    margin: 0 0 25px;
     text-transform: none;
 }
+section.team .col-md-3 h2 {
+    font-size: 20px;
+    margin-top: 20px;
+margin-bottom: 10px;
+}
 
 section.about .screendump {
     height: 220px;
@@ -310,9 +315,25 @@ section.about.white-bg .col-md-5 {
     padding-right: 43px;
     padding-left: 15px;
 }
-section.about img {
+section.about img, section.team img {
     width: 100%;
     min-width: 100%;
+    padding: 0 30px;
+}
+section.team .col-md-3 {
+ margin-top: 25px;
+}
+section.team .col-md-3 p {
+    font-size: 12px;
+}
+
+section.team .social {
+    width: 30px;
+    display:inline-block;
+    margin: 3px 3px 0 3px;
+}
+section.team .social img{
+   padding: 0;
 }
 
 section.contact .address .glyphicon {
diff --git a/public/images/Brackets.Sprint.37.msi b/public/images/Brackets.Sprint.37.msi
new file mode 100644
index 000000000000..a8647dff4291
Binary files /dev/null and b/public/images/Brackets.Sprint.37.msi differ
diff --git a/public/images/Thumbs.db b/public/images/Thumbs.db
index d82cef6f0a2b..d18920b2c9a6 100644
Binary files a/public/images/Thumbs.db and b/public/images/Thumbs.db differ
diff --git a/public/images/benjacobson.jpg b/public/images/benjacobson.jpg
new file mode 100644
index 000000000000..3f02646c6ae3
Binary files /dev/null and b/public/images/benjacobson.jpg differ
diff --git a/public/images/hillelcoren.jpg b/public/images/hillelcoren.jpg
new file mode 100644
index 000000000000..b1065d7dabf8
Binary files /dev/null and b/public/images/hillelcoren.jpg differ
diff --git a/public/images/instagram.svg b/public/images/instagram.svg
new file mode 100644
index 000000000000..57b4749dbdde
--- /dev/null
+++ b/public/images/instagram.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="412px" height="412px" viewBox="50 50 412 412" enable-background="new 50 50 412 412" xml:space="preserve">
+<circle fill="#1A1818" cx="256" cy="256" r="158.548"/>
+<path id="instagram-circle-icon" fill="#EDD71E" d="M353.894,166.068v25.315c0,4.059-3.291,7.349-7.351,7.349h-24.771
+	c-4.06,0-7.35-3.291-7.35-7.349v-25.315c0-4.059,3.29-7.35,7.35-7.35h24.771C350.603,158.718,353.894,162.009,353.894,166.068z
+	 M259,290.811c18.642,0,33.752-15.11,33.752-33.752s-15.11-33.751-33.752-33.751c-18.643,0-33.753,15.11-33.753,33.751
+	C225.247,275.699,240.358,290.811,259,290.811z M462,256c0,113.771-92.229,206-206,206c-113.771,0-206-92.229-206-206
+	c0-113.771,92.229-206,206-206C369.771,50,462,142.229,462,256z M374.837,222.731h-67.676c6.896,9.689,10.968,21.529,10.968,34.328
+	c0,32.738-26.541,59.279-59.279,59.279c-32.739,0-59.28-26.541-59.28-59.279c0-12.798,4.069-24.639,10.967-34.328h-67.372v103.89
+	c0,25.306,20.516,45.82,45.82,45.82h140.032c25.306,0,45.82-20.516,45.82-45.82V222.731z M258.85,302.729
+	c25.183,0,45.668-20.487,45.668-45.67c0-13.672-6.047-25.95-15.596-34.328c-3.352-2.938-7.13-5.392-11.235-7.259
+	c-5.748-2.614-12.121-4.083-18.837-4.083c-6.715,0-13.09,1.469-18.839,4.083c-4.104,1.867-7.884,4.321-11.234,7.259
+	c-9.549,8.377-15.597,20.656-15.597,34.328C213.18,282.24,233.668,302.729,258.85,302.729z M374.837,185.379
+	c0-25.307-20.516-45.82-45.82-45.82H203.804v57.766h-9.394v-57.766h-5.427c-0.354,0-0.705,0.018-1.059,0.026v57.74h-9.396v-56.554
+	c-2.274,0.531-4.484,1.229-6.615,2.086v54.468h-9.396v-49.34c-11.708,8.301-19.355,21.949-19.355,37.394v30.093h73.454
+	c10.751-10.917,25.697-17.693,42.231-17.693c16.532,0,31.479,6.776,42.232,17.693h73.755v-30.093H374.837z"/>
+</svg>
diff --git a/public/images/linkedin.svg b/public/images/linkedin.svg
new file mode 100644
index 000000000000..a71c78e6675d
--- /dev/null
+++ b/public/images/linkedin.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="411.999px" height="412px" viewBox="50.417 50 411.999 412" enable-background="new 50.417 50 411.999 412"
+	 xml:space="preserve">
+<circle fill="#1A1818" cx="267.952" cy="246.5" r="158.548"/>
+<path id="linkedin-circle-icon" fill="#EDD71E" d="M256.417,50c-113.771,0-206,92.229-206,206c0,113.771,92.229,206,206,206
+	c113.771,0,205.999-92.229,205.999-206C462.416,142.229,370.188,50,256.417,50z M201.456,355.592h-45.229V209.469h45.229V355.592z
+	 M178.626,190.333c-14.771,0-26.746-12.072-26.746-26.963c0-14.891,11.975-26.963,26.746-26.963
+	c14.77,0,26.745,12.072,26.745,26.963C205.371,178.261,193.396,190.333,178.626,190.333z M370.952,355.592h-45.01
+	c0,0,0-55.666,0-76.703s-7.991-32.781-24.626-32.781c-18.103,0-27.562,12.231-27.562,32.781c0,22.504,0,76.703,0,76.703h-43.38
+	V209.469h43.38v19.679c0,0,13.047-24.137,44.031-24.137c30.986,0,53.165,18.918,53.165,58.058
+	C370.952,302.209,370.952,355.592,370.952,355.592z"/>
+</svg>
diff --git a/public/images/me.svg b/public/images/me.svg
new file mode 100644
index 000000000000..f3d9149ab3bf
--- /dev/null
+++ b/public/images/me.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="412px" height="412px" viewBox="51.622 53.023 412 412" enable-background="new 51.622 53.023 412 412"
+	 xml:space="preserve">
+<circle fill="#EDD71E" cx="257.622" cy="259.023" r="206"/>
+<g>
+	<g>
+		<path fill="#1A1818" d="M115.904,314.482V203.564h17.388v15.549c3.598-5.435,8.379-9.787,14.354-13.108
+			c5.978-3.297,12.785-4.958,20.408-4.958c8.493,0,15.45,1.712,20.898,5.121c5.449,3.409,9.26,8.19,11.487,14.306
+			c9.071-12.947,20.886-19.427,35.417-19.427c11.399,0,20.13,3.045,26.247,9.134c6.113,6.104,9.172,15.489,9.172,28.159v76.143
+			H251.96v-69.878c0-7.523-0.641-12.933-1.887-16.242c-1.271-3.31-3.56-5.964-6.869-7.99c-3.31-2.013-7.185-3.031-11.651-3.031
+			c-8.065,0-14.77,2.604-20.093,7.787c-5.334,5.184-7.988,13.488-7.988,24.912v64.442h-19.44v-72.066
+			c0-8.354-1.584-14.619-4.743-18.797c-3.17-4.177-8.354-6.278-15.551-6.278c-5.474,0-10.53,1.396-15.173,4.188
+			c-4.644,2.78-8.002,6.846-10.09,12.205c-2.103,5.385-3.134,13.11-3.134,23.201v57.547H115.904z"/>
+		<path fill="#1A1818" d="M378.606,278.764l20.095,2.402c-3.185,11.349-9.035,20.155-17.604,26.435
+			c-8.58,6.266-19.501,9.398-32.837,9.398c-16.771,0-30.058-4.996-39.896-14.997c-9.814-9.99-14.734-24.006-14.734-42.048
+			c0-18.646,4.97-33.14,14.91-43.443c9.927-10.304,22.811-15.464,38.65-15.464c15.337,0,27.855,5.059,37.567,15.148
+			c9.714,10.09,14.583,24.308,14.583,42.627c0,1.107-0.038,2.78-0.101,5.007h-85.518c0.705,12.179,4.267,21.515,10.682,27.994
+			c6.404,6.479,14.394,9.712,23.969,9.712c7.134,0,13.223-1.798,18.256-5.422C371.661,292.49,375.65,286.702,378.606,278.764z
+			 M314.806,248.367h64.026c-0.867-9.323-3.308-16.319-7.36-20.999c-6.188-7.234-14.203-10.857-24.067-10.857
+			c-8.92,0-16.432,2.881-22.509,8.668C318.806,230.967,315.447,238.691,314.806,248.367z"/>
+	</g>
+</g>
+</svg>
diff --git a/public/images/razikantorp.jpg b/public/images/razikantorp.jpg
new file mode 100644
index 000000000000..5c3b20750f7d
Binary files /dev/null and b/public/images/razikantorp.jpg differ
diff --git a/public/images/shalomstark.jpg b/public/images/shalomstark.jpg
new file mode 100644
index 000000000000..eca82b3fdd24
Binary files /dev/null and b/public/images/shalomstark.jpg differ
diff --git a/public/images/twitter.svg b/public/images/twitter.svg
new file mode 100644
index 000000000000..5ae1b040da90
--- /dev/null
+++ b/public/images/twitter.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="412px" height="412px" viewBox="50 50 412 412" enable-background="new 50 50 412 412" xml:space="preserve">
+<circle fill="#1A1818" cx="262.452" cy="256.384" r="149.048"/>
+<path id="twitter-4-icon" fill="#EDD71E" d="M256,50C142.229,50,50,142.229,50,256c0,113.771,92.229,206,206,206
+	c113.771,0,206-92.229,206-206C462,142.229,369.771,50,256,50z M359.599,220.506c3.021,67.199-47.096,142.124-135.802,142.124
+	c-26.981,0-52.096-7.911-73.238-21.466c25.347,2.986,50.646-4.044,70.734-19.786c-20.907-0.386-38.556-14.198-44.632-33.181
+	c7.484,1.432,14.851,1.013,21.573-0.816c-22.976-4.617-38.839-25.316-38.319-47.453c6.438,3.58,13.81,5.729,21.642,5.977
+	c-21.278-14.221-27.303-42.318-14.785-63.789c23.563,28.906,58.771,47.928,98.479,49.92c-6.971-29.886,15.702-58.667,46.54-58.667
+	c13.742,0,26.16,5.802,34.874,15.088c10.886-2.143,21.108-6.119,30.343-11.594c-3.567,11.157-11.146,20.521-21.01,26.433
+	c9.665-1.153,18.874-3.722,27.441-7.523C377.033,205.355,368.935,213.771,359.599,220.506z"/>
+</svg>
diff --git a/public/images/vector-social-media-icons.zip b/public/images/vector-social-media-icons.zip
new file mode 100644
index 000000000000..fc65210c51e1
Binary files /dev/null and b/public/images/vector-social-media-icons.zip differ