Edgardo Palza e57a523e17 Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop %!s(int64=8) %!d(string=hai) anos
..
controller b429bd829c merge fix %!s(int64=8) %!d(string=hai) anos
model 908ef93e0d GlobalVariables in Model %!s(int64=8) %!d(string=hai) anos
view e57a523e17 Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop %!s(int64=8) %!d(string=hai) anos