200
Merge branch 'master' of https://github.com/rain-coders/Monopoly

Conflicts:	resloved
	main.cpp