fixed thing
Merge remote-tracking branch 'origin/master'

Conflicts:
	HW1/hw1.py