Merge remote-tracking branch 'stevenfarlie/master'

Conflicts: restaurants/nil.md
gsambrotta · Nov 3, 2012 · 8fd2918 · 8fd2918
2 parents 15377aa + 549053e
commit 8fd2918
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 0 deletions.
diff --git a/bars/mein-haus-am-see.md b/bars/mein-haus-am-see.md
@@ -4,3 +4,10 @@ Brunnenstraße 197, Berlin
 
 Perfect combination of trendy tunes, downbeat decor and arrogant
 staff.
+
+# Anno 64
+
+Gneisenaustraße 64, Berlin
+
+A downbeat bar with a pool table, weekend football on a big screen, and many German locals. Relaxed, friendly, and unpretentious.
+
diff --git a/bars/new_location.md b/bars/new_location.md
@@ -0,0 +1,5 @@
+# Supermolly
+
+Jessnerstraße am _TravePlatz_, *Berlin Friedrichshain*
+
+
diff --git a/cafes/eden.md b/cafes/eden.md
@@ -0,0 +1,5 @@
+# Eden*****
+
+Breite Straße 43a
+
+The centrally located café in the beautiful mansion at the EDEN***** Studios invites course attendees, ramblers and visitors to Berlin alike to while away the afternoon with a fine selection of teas and coffees.
diff --git a/cafes/the-barn.md b/cafes/the-barn.md
@@ -5,3 +5,9 @@ Auguststrasse 58
 Some of the best coffee in Germany! I recommend the filtered coffee,
 served black of course. Their Aeropress coffees are also fun to watch
 being made.
+
+# Passenger Espresso
+
+Oppelnerstr. 45
+
+Run by Kiwis, so they know how to make a good coffee. A mix of good music, imcluding old, obscure analog recordings.
diff --git a/restaurants/chinco.md b/restaurants/chinco.md
@@ -0,0 +1,5 @@
+# Chinco
+
+Georgenstraße 25
+
+vietnamese restaurant
diff --git a/restaurants/musashi.md b/restaurants/musashi.md
@@ -0,0 +1,3 @@
+# Musashi
+
+Fine sushi near Kottbusser Brücke. 
diff --git a/restaurants/nil.md b/restaurants/nil.md
@@ -4,3 +4,9 @@ Grunberger Strasse 52
 
 Sudanese food to die for. I recommend the Haloumi Tamiya (falafel). So
 good!!!
+
+# Hamy Cafe
+
+Hasenheide 10, Bwelin
+
+A small menu but brilliant, spicy Vietnamese. Best in Berlin by far.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		# Supermolly

		Jessnerstraße am _TravePlatz_, Berlin Friedrichshain