Merge branch 'master' of https://github.com/manomarks/play-with-docker

www/default/landing.html

@@ -54,9 +54,11 @@
 
       <div class="row marketing">
         <div class="col-lg-12">
-            <p>Play with Docker (PWD) is a project hacked by <a href="https://www.twitter.com/marcosnils">Marcos Liljedhal</a> and <a href="https://www.twitter.com/xetorthio">Jonathan Leibiusky</a> and sponsored by Docker Inc.</p>
-            <p>PWD is a Docker playground which allows users to run Docker commands in a matter of seconds. It gives the experience of having a free Alpine Linux Virtual Machine in browser, where you can build and run Docker containers and even create clusters in <a href="https://docs.docker.com/engine/swarm/">Docker Swarm Mode</a>. Under the hood Docker-in-Docker (DinD) is used to give the effect of multiple VMs/PCs. In addition to the playground, PWD also includes a training site composed of a large set of Docker labs and quizzes from beginner to advanced level available at <a href="http://training.play-with-docker.com/">training.play-with-docker.com</a>.</p>
-        </div>
+            <p>Play with Docker (PWD) is the official Docker playground which allows users to run Docker commands in a
+             matter of seconds. You can even even manage your Swarm or Kubernetes clusters with <a href="https://www.docker.com/enterprise-edition">Docker Enterprise Edition</a>. In addition to the playground, PWD also includes a training site composed of a large set of Docker labs and quizzes from beginner to advanced level available at <a href="http://training.play-with-docker.com/">training.play-with-docker.com</a>.</p>
+            <p>And don't forget to join us June 11-15 for DockerCon in San Francisco.</p>
+            <a href="http://2018.dockercon.com/"><img src="/assets/dockercon.png"</a>
+            </div>
       </div>
 
       <footer class="footer">