Updated server.rb
Merge branch 'master' of https://github.com/dkellis42/RentSplitter
updated databases
merge conflicts