New awesome coffee place
Merge remote-tracking branch 'ericluii/gh-pages' into gh-pages

Conflicts:
	places.js