Merge branch 'master' of taler.net:/var/git/www

4 files changed, 9 insertions, 1 deletions

diff --git a/about.html b/about.html
index dfe54132..497b6fda 100644
--- a/about.html
+++ b/about.html
@@ -115,6 +115,14 @@
           <p lang="fr">Trop romantique pour devenir millionnaire</p>
           <p lang="es">Demasiado romántico para hacerse millonario</p>
         </div>
+        <div class="col-lg-4">
+          <h2>Jeffrey Burdges</h2>
+          <p lang="en">Mathematician and developer.  Intrested in privacy.</p>
+          <p lang="it">Matematico</p> <!- -->
+          <p lang="de">Mathematiker</p> <!- und Software Entwickler -->
+          <p lang="fr">mathématicien</p> <!- et développeur de logiciels -->
+          <p lang="es">Matemático</p> <!- y desarrollador de software -->
+        </div>
       </div>
 
       <!--# include file="common/footer.inc" -->
diff --git a/images/logo-2015-medium.png b/images/logo-2015-medium.png
new file mode 100644
index 00000000..78159bb2
--- /dev/null
+++ b/images/logo-2015-medium.png
diff --git a/images/logo-2015.png b/images/logo-2015.png
new file mode 100644
index 00000000..7c988c94
--- /dev/null
+++ b/images/logo-2015.png
diff --git a/index.html b/index.html
index 532d75e3..552efa77 100644
--- a/index.html
+++ b/index.html
@@ -15,7 +15,7 @@
       <!--# include file="common/navigation.inc" -->
       <!-- Jumbotron -->
       <div class="jumbotron">
-        <img align="middle" width="33%" src="/images/logo-2014-medium.png" style="margin: 0px 0px -120px 0px;"></img>
+        <img align="middle" width="33%" src="/images/logo-2015-medium.png" style="margin: 0px 0px -120px 0px;"></img>
       </div>
       <div class="jumbotron">
          <h1 lang="en">Electronic payments for a liberal society!</h1>