first deployment to heroku
first deployment to heroku
add .env to .gitignore
add .env to .gitignore
use unicorn via procfile
gov
resolved merge conflicts
unfiltered tweets
pulling from upstream
pull from upstream
Merge pull request #41 from eshem/master

heroku
fetching from upstream
fixed nyt api key
made javascript loading conditional
resolved merge conflicts
Merge pull request #2 from abcm1989/twitterstream

Twitterstream
Merge pull request #42 from abcm1989/master

merge
integrated gmaps styling, pins dropping, and pin text with tweet and user