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

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	BuildingBlox/classes.py
Merge branch 'master' of https://github.com/EarlHaigCS/summative

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	BuildingBlox/classes.py