Cape Town has amazing coffee places.
Merge branch 'gh-pages' of github.com:richoakley/commitcoffee into richoakley-gh-pages

Conflicts:
	places.js