edited todo.txt
solved conflict...
conflict - yeah!
Merge branch 'master' of https://github.com/Marth68/Informatik3-FuriousFour