Just adding some more assignments and supporting code
Making a change to test.py that will conflict with
master
Making a change that will conflict with test
Merge branch 'test'

Conflicts:
	test.py
The extended euclidean algorithm
Added a change that will cause a conflict when I try to merge
Uh Oh!  There's a conflict that's about to happen
Merge branch 'feature-conflict'

Conflicts:
	hw1.py

Fixed the merge conflict in hw1.py