Oops the test I added for shapes.py was sort of copy-pasted and the variable names were backwards. It's fixed now.
Didn't push my changes from yesterday afternoon
Ended up redo-ing the three lines of code at home and then had a
conflict this morning.

Merge branch 'develop' of https://github.com/ThatGeoGuy/ENGO699-CV-Project into develop

Conflicts:
	tests/test_engo699_shapes.py