New awesome coffee place
Merge branch 'gh-pages' of github.com:naoyeye/commitcoffee into naoyeye-gh-pages

Conflicts:
	places.js