Merge branch 'master' of https://github.com/sophgersh/Per7-Gershon-Ghaemi-SGsquared

Conflicts:
	Settlers/HexGrid.pde