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
Fixed turbolinks js reload problem and moved searchbar to header with new css
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into Jess
add seed data for malaria hotspots
fixed merge conflicts
Added cuisines csv to seed database with country cuisines. WIP trying to make seed csv for intros
Fixed merge conflicts on seed file
Merge pull request #32 from JessicaTatham/Jess

Jess
commented out seeds file
fixed merge conflicts
Merge pull request #33 from davek09/master

updates for heroku push and malaria info