bug fixed
Merge branch 'master' of https://github.com/anweiqi/TwitterMap
small change
Merge branch 'master' of https://github.com/anweiqi/TwitterMap and schema change
in DB and write a sample of query

Conflicts:
	server.js
	views/index.jade