Removed bad files
Merge branch 'master' of github.com:/Grupp48/OOPLab
Fixed merging problem