commit for merge
Merge branch 'master' of github.com:Equadex/Monopoly-game

Conflicts:
	Debug/2dmonopol exp2.log
	Trade.h
	Trade_window.h