Changed a WHOOLE bunch of shit
Merge branch 'master' of https://github.com/sillydan1/OOP-Projekt-001