add fact cards to show page
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere
show page git status
change db to psql
precompiled assets
added rails_12factor to gemfile
updated gemfile.lock
commented out CSV for heroku test
add seed data for malaria hotspots
fixed merge conflicts
commented out seeds file
fixed merge conflicts
Merge pull request #33 from davek09/master

updates for heroku push and malaria info
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into Jess