Beat's first commit

added blabla to file
merged version of Beat and Marc

Beat's and Marc's comments merged in the text