server.rb routes done
relationships in seed
seed file update
fixing merge conflict