Merge https://github.com/FaithForHumans/SoftwareEngineeringProject into sprogel
Merge branch 'sprogel' of https://github.com/FaithForHumans/SoftwareEngineeringProject into sprogel
I added in the sychronized stuff. I think this should work. I'm scared to test. Don't make me test. Please.