fixed so you cannot create a new trade without requesting it
Merge branch 'master' of https://github.com/eternalearth888/csci446_team