Merges server.rb and app.rb