Pink Lane Coffee
Merge branch 'gh-pages' of github.com:samlambert/commitcoffee into samlambert-gh-pages

Conflicts:
	places.js