Merge branch 'staging'
Merge branch 'staging'
Delete database.yml
bootstrap fonts
seed.rb
Merge branch 'master' into staging