Revert "Revert "Merge branch 'working' of https://github.com/UF-COP-3053-Group/COP-3503-Project into working""

This reverts commit 5039f252a1ba4f1ae3d0233f5ac08667a12264d7.