small bug fix
Fixed a conflict
Merge branch 'master' of github.com:Daveiac/FProj_Gruppe48