Added San Francisco
Merge pull request #1 from danielduan/master

Added San Francisco
Merge branch 'gh-pages'
Also fixed @danielduan 's PR data to correct JSON

Conflicts:
	data/research.json