adfs
Merge branch 'master' of https://github.com/therealzteve/Monopoly.git

Conflicts:
	Monopoly/WebContent/index.jsp