Brown Coffee Co, San Antonio, TX
Merge branch 'gh-pages' of github.com:ryantanner/commitcoffee into ryantanner-gh-pages

Conflicts:
	places.js