fixed syntax nytimes helper
removed pry
Merge pull request #2 from abcm1989/twitterstream

Twitterstream
Merge pull request #42 from abcm1989/master

merge
pull from upstream
pull from upstream
fixed typo on application.css
integrated gmaps styling, pins dropping, and pin text with tweet and user
added rails_12factor gem to help deploy on heroku
broke twitter stream in to helper, cleaned up old helpers
updated readme and added favico
Merge pull request #43 from eshem/master

google maps update, readme, twitter helper
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