Merge pull request bitcoin-dot-org#46 from genjix/master

London Conference

_posts/events/2012-07-16-london.md

@@ -0,0 +1,16 @@
+---
+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).
+
+If you are interested in speaking, feel free to contact [genjix@bitcoin2012.com](mailto:genjix@bitcoin2012.com) as the call for papers is open.
+

index.html

@@ -147,13 +147,11 @@ <h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
             <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>