application change
Merge remote-tracking branch 'origin'
app.rb and font changes