fixed some bugs, got more bugs
Merge branch 'master' of https://github.com/Daveiac/FProj_Gruppe48.git