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
Merge pull request #39 from cblokker/map-colorizing

Map colorizing
fixed seed file
Merge pull request #40 from eshem/master

fixed seed file
pull from upstream
pushing heroku
remove end articles controller
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge pull request #41 from eshem/master

heroku
fetching from upstream
fixed nyt api key
made javascript loading conditional