hw 2 submit
hw2 submit
Merge branch 'temp_branch'

Conflicts:
	hw2/hw2.py