Uploading hw5
Merge branch 'master' of https://github.com/atproofer/SoftwareDesign

Conflicts:
	hw4/random_art.py
merge