Responsive
resp
Berlin

Events in Berlin
Merge branch 'events'

Conflicts:
	paris.html