Merge pull request #4 from danielkolvik/master

New cafe added
gsambrotta · Dec 3, 2012 · f3dfd53 · f3dfd53
2 parents 60ad48e + 4de8e22
commit f3dfd53
Show file tree

Hide file tree

Showing 26 changed files with 151 additions and 2 deletions.
diff --git a/bars/.DS_Store b/bars/.DS_Store
diff --git a/bars/Resonanz.md b/bars/Resonanz.md
@@ -0,0 +1,4 @@
+Resonanz
+==========
+
+hello
diff --git a/bars/fraulein_langer.md b/bars/fraulein_langer.md
@@ -0,0 +1,7 @@
+# Fraulein Langer
+
+Weisestraße 34, Berlin
+
+A bit grungy but the beer is cheap. 
+
+[link](www.frollein-langner.de/)
diff --git a/bars/madame_claude.md b/bars/madame_claude.md
@@ -0,0 +1,7 @@
+# Madame Claude
+
+Lübbener Straße 19, Berlin, DE. 
+
+http://www.facebook.com/MadameClaudeBerlin
+
+The greatest thing is the furniture being on the roof. Lot's of live music as well.
diff --git a/bars/st_oberholz.md b/bars/st_oberholz.md
@@ -0,0 +1,5 @@
+#St. Oberholz
+
+You buy a Club Mate and then you spend hours there watching kitten photos in your MacBook... *Man! Ain't we terrible?*
+
+_In Spain kitten photos will be banned next month._
diff --git a/bars/wild-renate.md b/bars/wild-renate.md
@@ -0,0 +1,5 @@
+# Salon - Zur wilden Renate
+
+Alt Stralau 70, Berlin
+
+There's a labyrinth inside!
diff --git a/cafes/README.md b/cafes/README.md
@@ -1,3 +1,4 @@
 Oh coffee, you complete me.
 
 List your favourite little cafes here. One file per cafe please!
+
diff --git a/cafes/beakers.md b/cafes/beakers.md
@@ -0,0 +1,5 @@
+# Beakers
+
+Dunckerstraße 69
+
+Very delicious breakfast
diff --git a/cafes/buchwald.txt b/cafes/buchwald.txt
@@ -0,0 +1,17 @@
+# Buchwald
+
+*Buchwald* ist......
+
+
+�Knarrender Parkettboden, gestreifte Strukturtapete, altmodische Gardinen, schlichtes Mobiliar und der Duft von frisch gebr�htem Kaffee verbreiten das Gef�hl in Oma�s Wohnzimmer zu sitzen.� So werden wir auf www.ausser-gewoehnlich.de beschrieben. Das k�nnen wir nur best�tigen, denn dieser Eindruck ist gewollt.
+
+http://www.konditorei-buchwald.de/
+
+Bartningallee 29 in 10557 Berlin
+
+�ffnungszeiten
+Montag bis Samstag 09 - 18 Uhr
+Sonn- und Feiertags 10 - 18 Uhr
+
+Bestellungen �ber
+Tel. +49 (0)30 391 59 31
diff --git a/cafes/cafe-du-pont.md b/cafes/cafe-du-pont.md
@@ -0,0 +1,4 @@
+# Cafe du Pont
+
+A nice café when you need a nice coffe while checking your email or doing some work.
+
diff --git a/cafes/fraulein-wild.md b/cafes/fraulein-wild.md
@@ -0,0 +1,5 @@
+# Fräulein Wild
+
+Dresdener Straße 13
+
+Some of the best Cake in Berlin! I recommend the poppy-seed cake. If the weather is good - grap a chair outside.
diff --git a/cafes/karvana.md b/cafes/karvana.md
@@ -0,0 +1,6 @@
+# Karvana
+
+Gabriel-Max-Straße 4  10245 Berlin, Germany
+0178 3433256
+
+Great for working, very quiet, good chai. Food is not that great.
diff --git a/cafes/kotti.md b/cafes/kotti.md
@@ -0,0 +1,2 @@
+Café Kotti 
+Kottbusser Tor
diff --git a/cafes/vux.md b/cafes/vux.md
@@ -0,0 +1,15 @@
+VUX café
+
+Wipperstraße 14
+
+12055 Neukölln
+
+![image alt text](http://www.berlin-vegan.de/typo3temp/pics/d6a7ad6652.jpg)
+
+_For vegans and anybody loving really yummy and healthy food :)_
+
+*The main reason to go here: Really big, handmade cakes, that make you yearn for more!*
+
+You can of course have a delicious fair-trade coffee either with soy or rice milk, drink chocolate or tea specialties with it. They also have cookies, cupcakes and waffles mit hot fruits & whipped soy cream. And at least on of the cakes is made with spelt flour.
+
+If you don't have a sweet tooth, they can mix you tropical smoothies made from açaí, maracujá, coconut, mango, guava or cashew-fruit. OR you try one of the daily soups & salads or bagels with fresh sprouts, marinated tofu-saté, seitan-limão, guava jelly and vegan cheese, houmous or sausage with caramelized onions.
diff --git a/coups/README.md b/coups/README.md
@@ -0,0 +1,2 @@
+Add a file to this directory for your favourite working space
+we can share our knowledge! 
diff --git a/coups/pulsraum.md b/coups/pulsraum.md
@@ -0,0 +1,13 @@
+# Pulsraum
+
+Coworking Arbeitsplätze PulsRaum
+U7 / U8
+Kottbusser Damm 25-26
+4.OG Öffnungszeiten 7-22 Uhr
+
+Schreibtisch Konferenzraum Küche WLAN feste und freie Arbeitsplätze
+Lift Briefkasten viel Licht
+
+www.pulsraum.de
+
+
diff --git a/restaurants/coco.md b/restaurants/coco.md
@@ -0,0 +1,6 @@
+# Cô Cô
+
+Rosenthalerstr. 2
+10119 Berlin
+
+Really awesome vietnamese style sandwiches, soups, noodle stuff with salad, banana cake, sweet corn deserts and more. It's incredible tasty and they have vegetarian/vegan choices, too. You DON'T want to miss this!
diff --git a/restaurants/curry36.md b/restaurants/curry36.md
@@ -0,0 +1,3 @@
+#Curry 36
+
+It's at Mehringdamm... 
diff --git a/restaurants/el-Camba-la-che-de-Mafalda.md b/restaurants/el-Camba-la-che-de-Mafalda.md
@@ -0,0 +1,10 @@
+# el Camba la che de Mafalda
+
+Skalitzerstr 45, 10997 Berlin 
+
+
+www.camba-la-che.de
+
+
+Great argentinian restaurant. Live music on fridays, good meet. Beware of getting
+wine though, it is really expansive. Recommended, the empanadas, delicious and not expansive!
diff --git a/restaurants/i_due_forni.md b/restaurants/i_due_forni.md
@@ -0,0 +1,7 @@
+My favorite pizza in the whole goddamned *world*.  The service is very punk rock and a bit angry at times, but it is worth it and really part of the charm.
+
+    i Due Forni
+    Schönhauser Allee 12
+	10119 Berlin, Germany
+
+![Amazingest Place in Berlin](http://assets3.qypecdn.net/uploads/photos/0321/2940/IMG_4793_gallery2.jpg)
diff --git a/restaurants/maroush.md b/restaurants/maroush.md
@@ -0,0 +1,5 @@
+# Maroush
+
+Adalbertstraße, don't remember the number
+
+Great falafel and shawarma, just the other side of the street from co.up. It fueled at least one coach during the workshop!
diff --git a/restaurants/nazuna.md b/restaurants/nazuna.md
@@ -0,0 +1,5 @@
+# Nazuna
+
+Danziger Str 65. 10435 Berlin
+
+Great japanese food - *NO* sushi. Instead some _great_ sweets and desserts.
diff --git a/restaurants/nil.md b/restaurants/nil.md
@@ -1,9 +1,11 @@
 # Nil
 
-Grunberger Strasse 52
+Gruenberger Strasse 52
 
 Sudanese food to die for. I recommend the Haloumi Tamiya (falafel). So
-good.
+good!!!
+
+Tanja: ja, lecker!
 
 # Hamy Cafe
 

diff --git a/restaurants/santamaria.md b/restaurants/santamaria.md
@@ -0,0 +1,3 @@
+#Santa Maria
+
+Check out this Mexican joint on Oranienstraße!
diff --git a/restaurants/yoyo.md b/restaurants/yoyo.md
@@ -0,0 +1,5 @@
+# Yoyo Foodworld
+
+G&auml;rtnerstraße 27
+
+Cheap vegan burgers, ideal hangover food.
diff --git a/restaurants/yumcha_heroes.md b/restaurants/yumcha_heroes.md
@@ -0,0 +1,5 @@
+# Yumcha Heroes
+
+Weinbergsweg 8
+
+Great chinese dumplings near Rosenthalerplatz.
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		Oh coffee, you complete me.

		List your favourite little cafes here. One file per cafe please!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		# Cafe du Pont

		A nice café when you need a nice coffe while checking your email or doing some work.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Add a file to this directory for your favourite working space
		we can share our knowledge!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#Santa Maria

		Check out this Mexican joint on Oranienstraße!