update server.rb
Merge branch 'newstaging' of github.com:Iawhite76/hackathon_project into newstaging