change on umples to enable color changing
Merge branch 'master' of https://github.com/LennyChiu/cs533

Conflicts:
	Umple/src/gameplotconcrete.ump