added data
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov into twitterstream

Conflicts:
	public/data/data.json
fixed merge conflicts
fixed errors from upstream commits
Merge pull request #3 from abcm1989/twitterstream

Twitterstream
Merge pull request #44 from abcm1989/master

fixed errors pulled from upstream