alpha beta
Merge branch 'master' of https://github.com/divir94/EECS-348

Conflicts:
	__pycache__/DivirA.cpython-34.pyc
	__pycache__/DivirB.cpython-34.pyc