New awesome coffee place
Merge branch 'patch-1' of github.com:julbaxter/commitcoffee into julbaxter-patch-1

Conflicts:
	places.js