From 2cf4a51440f88e769ed882373683bb2d1d1f57b5 Mon Sep 17 00:00:00 2001
From: Amir Taaki <genjix@riseup.net>
Date: Wed, 18 Jul 2012 20:27:54 +0200
Subject: [PATCH 1/2] London Conference.

---
 _posts/events/2012-07-16-london.md | 14 ++++++++++++++
 index.html                         |  2 --
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 _posts/events/2012-07-16-london.md

diff --git a/_posts/events/2012-07-16-london.md b/_posts/events/2012-07-16-london.md
new file mode 100644
index 00000000..8ce9256c
--- /dev/null
+++ b/_posts/events/2012-07-16-london.md
@@ -0,0 +1,14 @@
+---
+layout: post
+title: Bitcoin Conference (London)
+category: events
+---
+
+[Bitcoin Conference](http://bitcoin2012.com/), London Sept 15-16. [Ticket price](https://sites.google.com/a/bitcoin2012.com/homepage/tickets) for the first 100 tickets is €40 (Bitcoin accepted). We have a prestigious venue in central London with max capacity for 700 people.
+
+We want something for all parts of the community by having very in depth talks from experts about Bitcoin in: development, economics, law, finance, social, ethics.
+
+Our [first conference](http://bitgroups.org/) was about planning the future. This conference will be bringing Bitcoin to the mainstream. We will reach out to the general public with primer talks and workshops. We hope for this conference to bring greater opportunities to the community by promoting upcoming talent, and bringing investment to this fledgling economy.
+
+Confirmed speakers include [Richard Stallman](http://en.wikipedia.org/wiki/Richard_stallman), [Max Keiser](http://en.wikipedia.org/wiki/Max_keiser), [Birgitta Jónsdóttir](http://en.wikipedia.org/wiki/Birgitta_J%C3%B3nsd%C3%B3ttir) and others. For the full list of this year's speakers please visit the [speakers list](https://sites.google.com/a/bitcoin2012.com/homepage/speakers).
+
diff --git a/index.html b/index.html
index 13d3ae7c..900d569a 100644
--- a/index.html
+++ b/index.html
@@ -147,13 +147,11 @@ ALERT:
             <p><a class="btn" href="news.html">News archive</a></p>
           </section>
         </div>
-        <!--
         <div class="span6">
           {% for event in site.categories.events limit: 1 %}
           <h1>{{ event.title }}</a></h1>
           {{ event.content }}
           {% endfor %}
         </div>
-        -->
       </div>
     </div>

From f7af283e7ca81ed152262e2c75fbbb0d0c78248e Mon Sep 17 00:00:00 2001
From: Amir Taaki <genjix@riseup.net>
Date: Wed, 18 Jul 2012 20:33:00 +0200
Subject: [PATCH 2/2] Added part about CFP

---
 _posts/events/2012-07-16-london.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_posts/events/2012-07-16-london.md b/_posts/events/2012-07-16-london.md
index 8ce9256c..c10d6e0a 100644
--- a/_posts/events/2012-07-16-london.md
+++ b/_posts/events/2012-07-16-london.md
@@ -12,3 +12,5 @@ Our [first conference](http://bitgroups.org/) was about planning the future. Thi
 
 Confirmed speakers include [Richard Stallman](http://en.wikipedia.org/wiki/Richard_stallman), [Max Keiser](http://en.wikipedia.org/wiki/Max_keiser), [Birgitta Jónsdóttir](http://en.wikipedia.org/wiki/Birgitta_J%C3%B3nsd%C3%B3ttir) and others. For the full list of this year's speakers please visit the [speakers list](https://sites.google.com/a/bitcoin2012.com/homepage/speakers).
 
+If you are interested in speaking, feel free to contact [genjix@bitcoin2012.com](mailto:genjix@bitcoin2012.com) as the call for papers is open.
+