updated database.yml
Merge branch 'master' of https://github.com/kellanburket/chloe

No reason.
updated font files