Trade encounter started
Merge origin/master
Working on Trader Encounter