updated code
Merge branch 'master' of https://github.com/EarlHaigCS/summative

Conflicts:
	.idea/workspace.xml
	BuildingBlox/bbclasses.py
	BuildingBlox/bbmenu.py
	BuildingBlox/cityBuilding.py
	BuildingBlox/images/City/blankTile.png
	BuildingBlox/images/City/blueChoice.png
	BuildingBlox/images/City/blueComp.png
	BuildingBlox/images/City/blueIncomp.png
	BuildingBlox/images/City/choiceTile.png
	BuildingBlox/images/City/greenChoice.png
	BuildingBlox/images/City/greenComp.png
	BuildingBlox/images/City/greenIncomp.png
	BuildingBlox/images/City/redChoice.png
	BuildingBlox/images/City/redComp.png
	BuildingBlox/images/City/redIncomp.png
	BuildingBlox/images/City/yellowChoice.png
	BuildingBlox/images/City/yellowComp.png
	BuildingBlox/images/City/yellowIncomp.png
	BuildingBlox/images/Tower/Wire.png
	BuildingBlox/images/Tower/blueBase.png
	BuildingBlox/images/Tower/blueTop.png
	BuildingBlox/images/Tower/blueUnit.png
	BuildingBlox/images/Tower/cable.png
	BuildingBlox/images/Tower/greenBase.png
	BuildingBlox/images/Tower/greenTop.png
	BuildingBlox/images/Tower/greenUnit.png
	BuildingBlox/images/Tower/hook.png
	BuildingBlox/images/Tower/hookwire.png
	BuildingBlox/images/Tower/redBase.png
	BuildingBlox/images/Tower/redTop.png
	BuildingBlox/images/Tower/redUnit.png
	BuildingBlox/images/Tower/sky.png
	BuildingBlox/images/Tower/yellowBase.png
	BuildingBlox/images/Tower/yellowTop.png
	BuildingBlox/images/Tower/yellowUnit.png
	BuildingBlox/test.py
	BuildingBlox/towerBuilding.py