?
Merge branch 'master' of https://github.com/Barrpb16/CSF

Conflicts:
	Week 1/hw1_test.py
	Week 1/hw1_test.pyc