New awesome coffee places in Nashville
Merge branch 'gh-pages' of github.com:abutler3/commitcoffee into abutler3-gh-pages

Conflicts:
	places.js