modified:   python/update1/.DS_Store
	modified:   python/update1/gmap_query.py
	modified:   python/update1/traffic_timeline.py
Merge branch 'master' of https://github.com/sheenzhaox/twitter_traffic_nsw

Conflicts:
	python/update1/traffic_timeline.py

	modified:   python/update1/traffic_timeline.py