finished code for player to player trades, now need to make gui and tests
just need to finish tests ofr trades then write GUI for them
fixed conflicts merging with cheung