Homework 2- Final.
Merge branch 'master' of https://github.com/Barrpb16/CSF

Conflicts:
	hw2.py