Added randomness to quantity of tradegood
Merge origin/master