color matching text
Merge branch 'master' of https://github.com/jwbanning/best_driver

Conflicts:
	code/assets/data.js