diff --git a/app/views/home/_show.html.haml b/app/views/home/_show.html.haml
new file mode 100644
index 00000000000..f04102112f5
--- /dev/null
+++ b/app/views/home/_show.html.haml
@@ -0,0 +1,57 @@
+.navbar.navbar-fixed-top
+  .navbar-inner
+    .container-fluid
+      %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      %a.btn.btn-success.pull-left{:href => "/users/sign_in"} Login
+      %a.brand{:href => "/"} Diaspora*
+      .nav-collapse
+        %ul.nav
+          %li
+            %a{:href => "/about.html"} About
+          %li
+            %a{:href => "/privacy.html"} Privacy
+          %li
+            %a{:href => "/terms.html"} Terms
+
+  .subnav
+    %ul.nav.nav-pills
+      %li
+        %a{:href => "https://twitter.com/joindiaspora"} @joindiaspora
+      %li
+        %a{:href => "https://github.com/diaspora/diaspora"} GitHub
+      %li
+        %a{:href => "/source.tar.gz"} Code
+      %li
+        %a{:href => "https://github.com/diaspora/diaspora/tree/master/Changelog.md"} What's New?
+
+   
+  .container{:style => "padding-top: 5%;"}
+    .hero-unit
+      %img{:alt => "Logo", :src => "/assets/branding/logo_caps.png"}/
+      %hr/
+      %p
+        %b You're about to change the Internet. Let's get you set up, shall we?
+      %p
+        %a.btn.btn-primary.btn-large{:href => "/users/sign_up"} Start an account! »
+    .row
+      .span4
+        %h2 Heading
+        %p Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.
+        %p
+          %a.btn{:href => "#"} View details »
+      .span4
+        %h2 Heading
+        %p Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum ni.
+        %p
+          %a.btn{:href => "#"} View details »
+      .span4
+        %h2 Heading
+        %p Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis.
+        %p
+          %a.btn{:href => "#"} View details »
+
+  %script{:src => "/js/jquery.js"}
+  %script{:src => "/js/bootstrap.js"}
diff --git a/code b/code
new file mode 100644
index 00000000000..ab7ba37e919
--- /dev/null
+++ b/code
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,F4039FBDA41B150C751995712D1B9D5C
+
+CB5MvEboOlVlmHprJi+hCIIKcncp0mREijZiC/nUxlgHLCrxlbSY4fFXrxxb9EWS
+4djlRJYcuEZWRvvHDNMXRn6A4UxokDCh5UklEHkbOgR0fXrBHomBpLPKrgWB9TLR
+pR5v6fHMhMar86Xm34w7D/Fem75z+JeRpW03FTR4eLt+HPB5uizJxf8ccmOM/k/n
+tEKiY4EWN2kkcnPz3r3lIoVg7MwJ6Wc79gAn/KuP5W8jwnQSrJp4/zg8z7kJNsOs
+k9n6LWHKCxK7BxgTLCTz5SVoQR1O1tQc3ynaA9P4OPjZ90D3LEsfZ6NAvUWu6RwO
+OktGaD9h8Cl12A4+M8kCrJhS0rQFRKE0iToajMGN5uaQFBN6pRXJio5xvX5gIxrW
+jjft0NAO3thTENQMqGLKxh1wTpXh5cPiYWtz5uKvcZrwYraZp4xZCS4De8/Ds0Fr
+3VlOuLWTVs343ulNPe7TNyGdas45aGkwXNUJu91GmrmSBi0mxltaM/WrqRsUl5P0
+3qQYGW1nS/1O2hMviRkJw38WoEcilTqW5P9q60vVUH7Tny07C2u1Uai7tZ3UITjy
+7zILfL5rQZkROx1hacCV1q+rKI3snCeLtT2PssPhOuc5fpitu9I3HxdQf69cnMQA
+65cpdDQqi3lJP7L+En+9PA9Hzig4ZpjkWt6Z6pZC+iXlp2pLMMji0kWGOyXCnVVR
+bDpHhfzLrhyAg0Nakswg4u2AbLPHLKVs7p9EBDm1CA3y23nBSZndAmRMEstQ4cDH
+spWXTHx57akxmkvKA+Ro3uuMLCU+pRZU651lo/S33hSKEPIMtz02HTDi6tQ5JMfC
+lN3sdvFK+dQYY/ohB0jjKvfPV/KD0dOjCB8bppSUH+Zs1rk0wAxJPUiyGjHx3k3X
+qEXrB4kYxi8hqQP/1iN14fA7QOuFSupZNwlxpbepUnhF+rOVzbyAQiIadeWD5GC8
+Q7m0Dj0MG2Meu+eV1tGQZeXF/2kUVSCxNU9ngY0L09V+vErpP5AIqqxkFzAc2osS
+WqjtHnfuN3ST9KOMjveMIDYaMFA820GfWmiwlG432hUZ/ubE52HfIhXw5JDkzpzY
+80jrP11kmoR3/FG5Fux4ZSfbS8lzNoKsmMOhpBW3vQpTbelNbSIpMp/sG1d/addr
+yvVuuC9tKlTeXBP+uNJWIkNDtsG6oXgsbNZnl7BWIGVU0Xy2HKnPiAB9Qn+05xXH
+xxAREn2NfQ0psnEiQaNt80vyfyDong1FW56Mk9wh0DYFg07McvmAsrjuDhpqUm9M
+3wFOCKdbA3Snbw9RhA7+yap2FHTmBg7sWsYraxthuFefrZCkCYZsrDlPFuAWEKiG
+sUfM8K9whYLyLCbGvXXOb9ORZ5BlEp/e9AYnDwwxC650qMOm7cpX2U2HPuvQReuI
+keoc2y2z0O0KDfosQoScSe83K3i27VnGm2yMpcI34bq9eY6dZe84/mAens/QB132
+N0oEAfIwAZ60VjXaKlNeNOAg9EIE0M+MiiCYeZcrq43J3pNI0m1vtTqqmW6MWQ3N
+VIzEzsFtDWerRkcvUYRWYT1aEKqZkmBf1ERHtTg5R8z5G9C0cF7PggoR3mINCFqC
+-----END RSA PRIVATE KEY-----
diff --git a/code.pub b/code.pub
new file mode 100644
index 00000000000..21e0c0fdbc7
--- /dev/null
+++ b/code.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvaUJeIrZjrrP07rXQN1aefGJ3f+sv/CXJGOj/tC7+sbL8Vf31RaCATY7C7ZigjFM+GcNg1LKiDYT4FJgX85oRHkCWL9AplLVOkUd+N+9QpAAPeIEfdT+1sX0ILCy9CgXSKFlBOKAcqvsdKeujAvyKL7j0TczI+/TEcNKqyNM2muoWK58ZVfRyrJXn9VPYA+XO1gohjs9+COr8eVOp8qNgI8/AC5xfHDGEOVnekPSEG2PEh94SGDXTZ3GPgJstf4gmE6e75qcgyMt9t/brMon3km9KopS0lxQui3CQL95bQRy1M9NrJM1TfVjbb4Dmg4ETPOtQC+QF4COcnIR969wV jpl@jpl-VirtualBox