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

Conflicts:
	Debug/2dmonopol exp2.log
	Debug/2dmonopol.obj
	Debug/Auction.obj
	Debug/Auction_window.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Player.obj
	Debug/Property.obj
	Debug/Question.obj
	Debug/Street.obj
	Debug/Window_list.obj
	Debug/vc100.idb
	Debug/vc100.pdb
merge
Merge branch 'master' of https://github.com/Equadex/Monopoly-game

Conflicts:
	Debug/2dmonopol exp2.log
	Debug/2dmonopol.obj
	Debug/Auction.obj
	Debug/Auction_window.obj
	Debug/Button.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Player.obj
	Debug/Property.obj
	Debug/Question.obj
	Debug/Sprite.obj
	Debug/Status_box.obj
	Debug/Street.obj
	Debug/Text_field.obj
	Debug/Window_list.obj
	Debug/link.command.1.tlog
	Debug/link.read.1.tlog
	Debug/vc100.idb
	Debug/vc100.pdb
merge
Merge branch 'master' of https://github.com/Equadex/Monopoly-game

Conflicts:
	2dmonopol.cpp
	Debug/2dmonopol exp2.log
	Debug/2dmonopol.obj
	Debug/Auction.obj
	Debug/Auction_window.obj
	Debug/Button.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Player.obj
	Debug/Property.obj
	Debug/Question.obj
	Debug/Sprite.obj
	Debug/Status_box.obj
	Debug/Street.obj
	Debug/Text_field.obj
	Debug/Window_list.obj
	Debug/vc100.idb
	Debug/vc100.pdb
merge
Merge branch 'master' of https://github.com/Equadex/Monopoly-game

Conflicts:
	2dmonopol exp2.vcxproj.user
	2dmonopol.cpp
	Debug/2dmonopol exp2.Build.CppClean.log
	Debug/2dmonopol exp2.log
	Debug/2dmonopol.obj
	Debug/Auction.obj
	Debug/Auction_window.obj
	Debug/Button.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Player.obj
	Debug/Property.obj
	Debug/Question.obj
	Debug/Sprite.obj
	Debug/Status_box.obj
	Debug/Street.obj
	Debug/Text_field.obj
	Debug/Window_list.obj
	Debug/link.read.1.tlog
	Debug/vc100.idb
	Debug/vc100.pdb
commit for merge
Merge branch 'master' of https://github.com/Equadex/Monopoly-game

Conflicts:
	Debug/2dmonopol exp2.Build.CppClean.log
	Debug/2dmonopol exp2.lastbuildstate
	Debug/2dmonopol exp2.log
	Debug/2dmonopol.obj
	Debug/Auction.obj
	Debug/Auction_window.obj
	Debug/Button.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Player.obj
	Debug/Property.obj
	Debug/Question.obj
	Debug/Sprite.obj
	Debug/Status_box.obj
	Debug/Street.obj
	Debug/Text_field.obj
	Debug/Window_list.obj
	Debug/cl.command.1.tlog
	Debug/link.command.1.tlog
	Debug/link.read.1.tlog
	Debug/link.write.1.tlog
	Debug/mt.command.1.tlog
	Debug/mt.read.1.tlog
	Debug/mt.write.1.tlog
	Debug/vc100.idb
	Debug/vc100.pdb
commit for merge, work in progress. DOESN'T WORK!