added com ability to choose to do something and player to do something
Merge branch 'master' of https://github.com/sophgersh/Per7-Gershon-Ghaemi-SGsquared

Conflicts:
	Settlers/Player.pde
	Settlers/RightSide.pde