synced changes
fixed error
Merge branch 'master' of https://github.com/EthanSoch/CSC324-Team-1.git