Update data.json
Merge branch 'master' of https://github.com/liljonnystyle/sf_traffic

Conflicts:
	data.json