Edgardo Palza 5322e747d8 Fix the bad merge 8 gadi atpakaļ
..
controller 5322e747d8 Fix the bad merge 8 gadi atpakaļ
model a763193152 Graph 8 gadi atpakaļ
view 3137227cef Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop 8 gadi atpakaļ