minor change
eerge branch 'master' of https://github.com/anweiqi/TwitterMap

Conflicts:
	dynamodb.js
	public/javascripts/script.js
	views/index.jade