Adding robocup.dsc
Deleting existing robocup.dsc
Changes in Goalkeeper
Solving conflics2