Tischendorf, Berlin
Merge branch 'tischendorf-berlin' of github.com:mcveat/commitcoffee into mcveat-tischendorf-berlin

Conflicts:
	places.js