Changed filename to app.rb
Added newline character
Merge branch 'base'