diff --git a/app/views/about_us.blade.php b/app/views/about_us.blade.php
index 68caa700259a..b1676688f605 100644
--- a/app/views/about_us.blade.php
+++ b/app/views/about_us.blade.php
@@ -38,7 +38,11 @@
   <div class="navbar" style="margin-bottom:0px">
     <div class="container">
       <div class="navbar-inner">
+<<<<<<< HEAD
+        <a class="brand" href="#"><img src=
+=======
         <a class="brand" href="/"><img src=
+>>>>>>> upstream/master
           "images/invoiceninja-logo.png"></a>
           <ul class="navbar-list">
             <li>{{ link_to('about', 'About Us' ) }}</li>
diff --git a/app/views/emails/confirm_text.blade.php b/app/views/emails/confirm_text.blade.php
old mode 100755
new mode 100644
diff --git a/public/css/style.css b/public/css/style.css
index 088456fafd0c..6a44343b9dca 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,4 +1,4 @@
-body { background: #f8f8f8 !important;
+body { background: #fff !important;
     font-family: 'Roboto', sans-serif;
     font-family: 'Roboto', sans-serif;
 }
@@ -220,6 +220,14 @@ border-color: #0b4d78;
 margin-left: 10px !important;
 }
 
+/*alerts*/
+
+.alert {
+padding: 15px;
+border: none;
+border-radius: 3px;
+}
+
 /*new*/
 
 div {
diff --git a/public/images/hero-bg-4.psd b/public/images/hero-bg-4.psd
new file mode 100644
index 000000000000..d231c69500a2
Binary files /dev/null and b/public/images/hero-bg-4.psd differ