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