had to commit this file to be able to pull commits... ?!?
solved conflict...
Merge branch 'master' of https://github.com/Marth68/Informatik3-FuriousFour.git