Can bump into Trader and begin trade, Band-aids
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZombieApocalypseWPF/MainWindow.xaml.cs